You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/11/21 16:26:48 UTC
[01/54] [abbrv] [partial] Reformatted all of the code.
Updated Branches:
refs/heads/reformat 023290670 -> 170f32f17
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java b/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java
index 6ba546d..211280d 100644
--- a/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java
@@ -20,6 +20,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;
+
import javax.ejb.Local;
import org.apache.log4j.Logger;
@@ -29,8 +30,8 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.db.SearchCriteria.Op;
+import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.exception.CloudRuntimeException;
@Component
@@ -54,17 +55,20 @@ public class PortProfileDaoImpl extends GenericDaoBase<PortProfileVO, Long> impl
accessVlanSearch.done();
}
+ @Override
public PortProfileVO findByName(String portProfileName) {
SearchCriteria<PortProfileVO> sc = nameSearch.create();
sc.setParameters("portProfileName", portProfileName);
return findOneBy(sc);
}
+ @Override
@DB
public boolean doesVlanRangeClash(int lowVlanId, int highVlanId) {
String dbName = "cloud";
String tableName = "port_profile";
- String condition = "(trunk_low_vlan_id BETWEEN " + lowVlanId + " AND " + highVlanId + ")" + " OR (trunk_high_vlan_id BETWEEN " + lowVlanId + " AND " + highVlanId + ")";
+ String condition =
+ "(trunk_low_vlan_id BETWEEN " + lowVlanId + " AND " + highVlanId + ")" + " OR (trunk_high_vlan_id BETWEEN " + lowVlanId + " AND " + highVlanId + ")";
String selectSql = "SELECT * FROM `" + dbName + "`.`" + tableName + "` WHERE " + condition;
TransactionLegacy txn = TransactionLegacy.currentTxn();
@@ -81,6 +85,7 @@ public class PortProfileDaoImpl extends GenericDaoBase<PortProfileVO, Long> impl
return false;
}
+ @Override
public List<PortProfileVO> listByVlanId(int vlanId) {
SearchCriteria<PortProfileVO> sc = accessVlanSearch.create();
sc.setParameters("accessVlanId", vlanId);
[12/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/Grant.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/Grant.java b/awsapi/src/com/amazon/s3/Grant.java
index 65959f2..118ea33 100644
--- a/awsapi/src/com/amazon/s3/Grant.java
+++ b/awsapi/src/com/amazon/s3/Grant.java
@@ -125,7 +125,8 @@ public class Grant implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -184,9 +185,8 @@ public class Grant implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/Grantee.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/Grantee.java b/awsapi/src/com/amazon/s3/Grantee.java
index f053f1f..9cfc393 100644
--- a/awsapi/src/com/amazon/s3/Grantee.java
+++ b/awsapi/src/com/amazon/s3/Grantee.java
@@ -77,7 +77,8 @@ public abstract class Grantee implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -126,9 +127,8 @@ public abstract class Grantee implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/Group.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/Group.java b/awsapi/src/com/amazon/s3/Group.java
index 3c55efe..61ac082 100644
--- a/awsapi/src/com/amazon/s3/Group.java
+++ b/awsapi/src/com/amazon/s3/Group.java
@@ -101,7 +101,8 @@ public class Group extends com.amazon.s3.Grantee implements org.apache.axis2.dat
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -178,9 +179,8 @@ public class Group extends com.amazon.s3.Grantee implements org.apache.axis2.dat
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/ListAllMyBuckets.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/ListAllMyBuckets.java b/awsapi/src/com/amazon/s3/ListAllMyBuckets.java
index b245056..649f83b 100644
--- a/awsapi/src/com/amazon/s3/ListAllMyBuckets.java
+++ b/awsapi/src/com/amazon/s3/ListAllMyBuckets.java
@@ -188,7 +188,8 @@ public class ListAllMyBuckets implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -335,9 +336,8 @@ public class ListAllMyBuckets implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/ListAllMyBucketsEntry.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/ListAllMyBucketsEntry.java b/awsapi/src/com/amazon/s3/ListAllMyBucketsEntry.java
index 5e7c5d6..d2be7bf 100644
--- a/awsapi/src/com/amazon/s3/ListAllMyBucketsEntry.java
+++ b/awsapi/src/com/amazon/s3/ListAllMyBucketsEntry.java
@@ -125,7 +125,8 @@ public class ListAllMyBucketsEntry implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class ListAllMyBucketsEntry implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/ListAllMyBucketsList.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/ListAllMyBucketsList.java b/awsapi/src/com/amazon/s3/ListAllMyBucketsList.java
index ede2e3e..8125673 100644
--- a/awsapi/src/com/amazon/s3/ListAllMyBucketsList.java
+++ b/awsapi/src/com/amazon/s3/ListAllMyBucketsList.java
@@ -142,7 +142,8 @@ public class ListAllMyBucketsList implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class ListAllMyBucketsList implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/ListAllMyBucketsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/ListAllMyBucketsResponse.java b/awsapi/src/com/amazon/s3/ListAllMyBucketsResponse.java
index 7210bdd..9fc5121 100644
--- a/awsapi/src/com/amazon/s3/ListAllMyBucketsResponse.java
+++ b/awsapi/src/com/amazon/s3/ListAllMyBucketsResponse.java
@@ -98,7 +98,8 @@ public class ListAllMyBucketsResponse implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -152,9 +153,8 @@ public class ListAllMyBucketsResponse implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -360,7 +360,8 @@ public class ListAllMyBucketsResponse implements org.apache.axis2.databinding.AD
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "ListAllMyBucketsResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "ListAllMyBucketsResponse").equals(reader.getName())) {
object.setListAllMyBucketsResponse(com.amazon.s3.ListAllMyBucketsResult.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/ListAllMyBucketsResult.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/ListAllMyBucketsResult.java b/awsapi/src/com/amazon/s3/ListAllMyBucketsResult.java
index b86b7b7..a9f225a 100644
--- a/awsapi/src/com/amazon/s3/ListAllMyBucketsResult.java
+++ b/awsapi/src/com/amazon/s3/ListAllMyBucketsResult.java
@@ -125,7 +125,8 @@ public class ListAllMyBucketsResult implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -184,9 +185,8 @@ public class ListAllMyBucketsResult implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/ListBucket.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/ListBucket.java b/awsapi/src/com/amazon/s3/ListBucket.java
index 3b7f995..ee198c0 100644
--- a/awsapi/src/com/amazon/s3/ListBucket.java
+++ b/awsapi/src/com/amazon/s3/ListBucket.java
@@ -403,7 +403,8 @@ public class ListBucket implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -744,9 +745,8 @@ public class ListBucket implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/ListBucketResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/ListBucketResponse.java b/awsapi/src/com/amazon/s3/ListBucketResponse.java
index 4f7f405..a8cae0e 100644
--- a/awsapi/src/com/amazon/s3/ListBucketResponse.java
+++ b/awsapi/src/com/amazon/s3/ListBucketResponse.java
@@ -98,7 +98,8 @@ public class ListBucketResponse implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -152,9 +153,8 @@ public class ListBucketResponse implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/ListBucketResult.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/ListBucketResult.java b/awsapi/src/com/amazon/s3/ListBucketResult.java
index 21f2658..5a68a8c 100644
--- a/awsapi/src/com/amazon/s3/ListBucketResult.java
+++ b/awsapi/src/com/amazon/s3/ListBucketResult.java
@@ -468,7 +468,8 @@ public class ListBucketResult implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -787,9 +788,8 @@ public class ListBucketResult implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -1135,7 +1135,8 @@ public class ListBucketResult implements org.apache.axis2.databinding.ADBBean {
}
// call the converter utility to convert and set the array
- object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class, list1));
+ object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class,
+ list1));
} // End of if for expected property start element
@@ -1341,7 +1342,8 @@ public class ListBucketResult implements org.apache.axis2.databinding.ADBBean {
}
// call the converter utility to convert and set the array
- object.setCommonPrefixes((com.amazon.s3.PrefixEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.PrefixEntry.class, list10));
+ object.setCommonPrefixes((com.amazon.s3.PrefixEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+ com.amazon.s3.PrefixEntry.class, list10));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/ListEntry.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/ListEntry.java b/awsapi/src/com/amazon/s3/ListEntry.java
index d176475..4829e58 100644
--- a/awsapi/src/com/amazon/s3/ListEntry.java
+++ b/awsapi/src/com/amazon/s3/ListEntry.java
@@ -235,7 +235,8 @@ public class ListEntry implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -419,9 +420,8 @@ public class ListEntry implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/ListVersionsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/ListVersionsResponse.java b/awsapi/src/com/amazon/s3/ListVersionsResponse.java
index aa61ebc..016f8a3 100644
--- a/awsapi/src/com/amazon/s3/ListVersionsResponse.java
+++ b/awsapi/src/com/amazon/s3/ListVersionsResponse.java
@@ -98,7 +98,8 @@ public class ListVersionsResponse implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -152,9 +153,8 @@ public class ListVersionsResponse implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/ListVersionsResult.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/ListVersionsResult.java b/awsapi/src/com/amazon/s3/ListVersionsResult.java
index 4558808..509c5d2 100644
--- a/awsapi/src/com/amazon/s3/ListVersionsResult.java
+++ b/awsapi/src/com/amazon/s3/ListVersionsResult.java
@@ -426,7 +426,8 @@ public class ListVersionsResult implements org.apache.axis2.databinding.ADBBean
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localListVersionsResultChoice_type0);
list.add(param);
- this.localListVersionsResultChoice_type0 = (com.amazon.s3.ListVersionsResultChoice_type0[])list.toArray(new com.amazon.s3.ListVersionsResultChoice_type0[list.size()]);
+ this.localListVersionsResultChoice_type0 =
+ (com.amazon.s3.ListVersionsResultChoice_type0[])list.toArray(new com.amazon.s3.ListVersionsResultChoice_type0[list.size()]);
}
@@ -530,7 +531,8 @@ public class ListVersionsResult implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -913,9 +915,8 @@ public class ListVersionsResult implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -1278,7 +1279,8 @@ public class ListVersionsResult implements org.apache.axis2.databinding.ADBBean
}
// call the converter utility to convert and set the array
- object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class, list1));
+ object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class,
+ list1));
} // End of if for expected property start element
@@ -1514,7 +1516,8 @@ public class ListVersionsResult implements org.apache.axis2.databinding.ADBBean
}
// call the converter utility to convert and set the array
- object.setCommonPrefixes((com.amazon.s3.PrefixEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.PrefixEntry.class, list12));
+ object.setCommonPrefixes((com.amazon.s3.PrefixEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+ com.amazon.s3.PrefixEntry.class, list12));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/ListVersionsResultChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/ListVersionsResultChoice_type0.java b/awsapi/src/com/amazon/s3/ListVersionsResultChoice_type0.java
index d8ff797..85c466c 100644
--- a/awsapi/src/com/amazon/s3/ListVersionsResultChoice_type0.java
+++ b/awsapi/src/com/amazon/s3/ListVersionsResultChoice_type0.java
@@ -168,7 +168,8 @@ public class ListVersionsResultChoice_type0 implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -207,9 +208,8 @@ public class ListVersionsResultChoice_type0 implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/LocationConstraint.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/LocationConstraint.java b/awsapi/src/com/amazon/s3/LocationConstraint.java
index 378c84a..f97e2dc 100644
--- a/awsapi/src/com/amazon/s3/LocationConstraint.java
+++ b/awsapi/src/com/amazon/s3/LocationConstraint.java
@@ -107,7 +107,8 @@ public class LocationConstraint implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -167,9 +168,8 @@ public class LocationConstraint implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/LoggingSettings.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/LoggingSettings.java b/awsapi/src/com/amazon/s3/LoggingSettings.java
index d15adb4..b759bfb 100644
--- a/awsapi/src/com/amazon/s3/LoggingSettings.java
+++ b/awsapi/src/com/amazon/s3/LoggingSettings.java
@@ -163,7 +163,8 @@ public class LoggingSettings implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -281,9 +282,8 @@ public class LoggingSettings implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/MetadataDirective.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/MetadataDirective.java b/awsapi/src/com/amazon/s3/MetadataDirective.java
index d5bf4bf..b376686 100644
--- a/awsapi/src/com/amazon/s3/MetadataDirective.java
+++ b/awsapi/src/com/amazon/s3/MetadataDirective.java
@@ -120,7 +120,8 @@ public class MetadataDirective implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -178,9 +179,8 @@ public class MetadataDirective implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -319,9 +319,9 @@ public class MetadataDirective implements org.apache.axis2.databinding.ADBBean {
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
//We can safely assume an element has only one type associated with it
- return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME,
- new java.lang.Object[] {org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT,
- org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localMetadataDirective)}, null);
+ return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME, new java.lang.Object[] {
+ org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT,
+ org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localMetadataDirective)}, null);
}
@@ -333,7 +333,7 @@ public class MetadataDirective implements org.apache.axis2.databinding.ADBBean {
public static MetadataDirective fromValue(java.lang.String value) throws java.lang.IllegalArgumentException {
MetadataDirective enumeration = (MetadataDirective)
- _table_.get(value);
+ _table_.get(value);
if (enumeration == null)
throw new java.lang.IllegalArgumentException();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/MetadataEntry.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/MetadataEntry.java b/awsapi/src/com/amazon/s3/MetadataEntry.java
index 85f200a..d4b3cb3 100644
--- a/awsapi/src/com/amazon/s3/MetadataEntry.java
+++ b/awsapi/src/com/amazon/s3/MetadataEntry.java
@@ -125,7 +125,8 @@ public class MetadataEntry implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class MetadataEntry implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/MfaDeleteStatus.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/MfaDeleteStatus.java b/awsapi/src/com/amazon/s3/MfaDeleteStatus.java
index 206b0e7..63e9827 100644
--- a/awsapi/src/com/amazon/s3/MfaDeleteStatus.java
+++ b/awsapi/src/com/amazon/s3/MfaDeleteStatus.java
@@ -120,7 +120,8 @@ public class MfaDeleteStatus implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -178,9 +179,8 @@ public class MfaDeleteStatus implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -320,8 +320,8 @@ public class MfaDeleteStatus implements org.apache.axis2.databinding.ADBBean {
//We can safely assume an element has only one type associated with it
return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME, new java.lang.Object[] {
- org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localMfaDeleteStatus)},
- null);
+ org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT,
+ org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localMfaDeleteStatus)}, null);
}
@@ -333,7 +333,7 @@ public class MfaDeleteStatus implements org.apache.axis2.databinding.ADBBean {
public static MfaDeleteStatus fromValue(java.lang.String value) throws java.lang.IllegalArgumentException {
MfaDeleteStatus enumeration = (MfaDeleteStatus)
- _table_.get(value);
+ _table_.get(value);
if (enumeration == null)
throw new java.lang.IllegalArgumentException();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/NotificationConfiguration.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/NotificationConfiguration.java b/awsapi/src/com/amazon/s3/NotificationConfiguration.java
index 5071b5f..2d61414 100644
--- a/awsapi/src/com/amazon/s3/NotificationConfiguration.java
+++ b/awsapi/src/com/amazon/s3/NotificationConfiguration.java
@@ -142,7 +142,8 @@ public class NotificationConfiguration implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -187,7 +188,8 @@ public class NotificationConfiguration implements org.apache.axis2.databinding.A
if (localTopicConfiguration != null) {
for (int i = 0; i < localTopicConfiguration.length; i++) {
if (localTopicConfiguration[i] != null) {
- localTopicConfiguration[i].serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "TopicConfiguration"), factory, xmlWriter);
+ localTopicConfiguration[i].serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "TopicConfiguration"), factory,
+ xmlWriter);
} else {
// we don't have to do any thing since minOccures is zero
@@ -208,9 +210,8 @@ public class NotificationConfiguration implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/Payer.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/Payer.java b/awsapi/src/com/amazon/s3/Payer.java
index 0c17d7c..ea33c56 100644
--- a/awsapi/src/com/amazon/s3/Payer.java
+++ b/awsapi/src/com/amazon/s3/Payer.java
@@ -120,7 +120,8 @@ public class Payer implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -178,9 +179,8 @@ public class Payer implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -320,7 +320,8 @@ public class Payer implements org.apache.axis2.databinding.ADBBean {
//We can safely assume an element has only one type associated with it
return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME, new java.lang.Object[] {
- org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localPayer)}, null);
+ org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localPayer)},
+ null);
}
@@ -332,7 +333,7 @@ public class Payer implements org.apache.axis2.databinding.ADBBean {
public static Payer fromValue(java.lang.String value) throws java.lang.IllegalArgumentException {
Payer enumeration = (Payer)
- _table_.get(value);
+ _table_.get(value);
if (enumeration == null)
throw new java.lang.IllegalArgumentException();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/Permission.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/Permission.java b/awsapi/src/com/amazon/s3/Permission.java
index a29da13..1fad5a7 100644
--- a/awsapi/src/com/amazon/s3/Permission.java
+++ b/awsapi/src/com/amazon/s3/Permission.java
@@ -132,7 +132,8 @@ public class Permission implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -190,9 +191,8 @@ public class Permission implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -331,8 +331,9 @@ public class Permission implements org.apache.axis2.databinding.ADBBean {
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
//We can safely assume an element has only one type associated with it
- return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME, new java.lang.Object[] {
- org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localPermission)}, null);
+ return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME,
+ new java.lang.Object[] {org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT,
+ org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localPermission)}, null);
}
@@ -344,7 +345,7 @@ public class Permission implements org.apache.axis2.databinding.ADBBean {
public static Permission fromValue(java.lang.String value) throws java.lang.IllegalArgumentException {
Permission enumeration = (Permission)
- _table_.get(value);
+ _table_.get(value);
if (enumeration == null)
throw new java.lang.IllegalArgumentException();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/PostResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/PostResponse.java b/awsapi/src/com/amazon/s3/PostResponse.java
index b98b059..dc5c6e1 100644
--- a/awsapi/src/com/amazon/s3/PostResponse.java
+++ b/awsapi/src/com/amazon/s3/PostResponse.java
@@ -170,7 +170,8 @@ public class PostResponse implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -347,9 +348,8 @@ public class PostResponse implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/PrefixEntry.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/PrefixEntry.java b/awsapi/src/com/amazon/s3/PrefixEntry.java
index b255581..65e9ea4 100644
--- a/awsapi/src/com/amazon/s3/PrefixEntry.java
+++ b/awsapi/src/com/amazon/s3/PrefixEntry.java
@@ -101,7 +101,8 @@ public class PrefixEntry implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class PrefixEntry implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/PutObject.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/PutObject.java b/awsapi/src/com/amazon/s3/PutObject.java
index 0494b89..1c7efa2 100644
--- a/awsapi/src/com/amazon/s3/PutObject.java
+++ b/awsapi/src/com/amazon/s3/PutObject.java
@@ -443,7 +443,8 @@ public class PutObject implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -745,9 +746,8 @@ public class PutObject implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -1106,7 +1106,8 @@ public class PutObject implements org.apache.axis2.databinding.ADBBean {
}
// call the converter utility to convert and set the array
- object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class, list3));
+ object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class,
+ list3));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/PutObjectInline.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/PutObjectInline.java b/awsapi/src/com/amazon/s3/PutObjectInline.java
index ff18b87..14cf966 100644
--- a/awsapi/src/com/amazon/s3/PutObjectInline.java
+++ b/awsapi/src/com/amazon/s3/PutObjectInline.java
@@ -467,7 +467,8 @@ public class PutObjectInline implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -794,9 +795,8 @@ public class PutObjectInline implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -1159,7 +1159,8 @@ public class PutObjectInline implements org.apache.axis2.databinding.ADBBean {
}
// call the converter utility to convert and set the array
- object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class, list3));
+ object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class,
+ list3));
} // End of if for expected property start element
@@ -1178,7 +1179,8 @@ public class PutObjectInline implements org.apache.axis2.databinding.ADBBean {
} else {
if (reader.getEventType() == javax.xml.stream.XMLStreamConstants.START_ELEMENT &&
reader.getName().equals(
- new javax.xml.namespace.QName(org.apache.axiom.om.impl.MTOMConstants.XOP_NAMESPACE_URI, org.apache.axiom.om.impl.MTOMConstants.XOP_INCLUDE))) {
+ new javax.xml.namespace.QName(org.apache.axiom.om.impl.MTOMConstants.XOP_NAMESPACE_URI,
+ org.apache.axiom.om.impl.MTOMConstants.XOP_INCLUDE))) {
java.lang.String id = org.apache.axiom.om.util.ElementHelper.getContentID(reader, "UTF-8");
object.setData(((org.apache.axiom.soap.impl.builder.MTOMStAXSOAPModelBuilder)((org.apache.axiom.om.impl.llom.OMStAXWrapper)reader).getBuilder()).getDataHandler(id));
reader.next();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/PutObjectInlineResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/PutObjectInlineResponse.java b/awsapi/src/com/amazon/s3/PutObjectInlineResponse.java
index 83df649..5fefbcb 100644
--- a/awsapi/src/com/amazon/s3/PutObjectInlineResponse.java
+++ b/awsapi/src/com/amazon/s3/PutObjectInlineResponse.java
@@ -98,7 +98,8 @@ public class PutObjectInlineResponse implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -152,9 +153,8 @@ public class PutObjectInlineResponse implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -360,7 +360,8 @@ public class PutObjectInlineResponse implements org.apache.axis2.databinding.ADB
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "PutObjectInlineResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "PutObjectInlineResponse").equals(reader.getName())) {
object.setPutObjectInlineResponse(com.amazon.s3.PutObjectResult.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/PutObjectResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/PutObjectResponse.java b/awsapi/src/com/amazon/s3/PutObjectResponse.java
index d7ff717..5ca8d8f 100644
--- a/awsapi/src/com/amazon/s3/PutObjectResponse.java
+++ b/awsapi/src/com/amazon/s3/PutObjectResponse.java
@@ -98,7 +98,8 @@ public class PutObjectResponse implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -152,9 +153,8 @@ public class PutObjectResponse implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/PutObjectResult.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/PutObjectResult.java b/awsapi/src/com/amazon/s3/PutObjectResult.java
index 997626e..27daa56 100644
--- a/awsapi/src/com/amazon/s3/PutObjectResult.java
+++ b/awsapi/src/com/amazon/s3/PutObjectResult.java
@@ -125,7 +125,8 @@ public class PutObjectResult implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class PutObjectResult implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/RequestPaymentConfiguration.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/RequestPaymentConfiguration.java b/awsapi/src/com/amazon/s3/RequestPaymentConfiguration.java
index 5f689af..170c5ef 100644
--- a/awsapi/src/com/amazon/s3/RequestPaymentConfiguration.java
+++ b/awsapi/src/com/amazon/s3/RequestPaymentConfiguration.java
@@ -101,7 +101,8 @@ public class RequestPaymentConfiguration implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -155,9 +156,8 @@ public class RequestPaymentConfiguration implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/Result.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/Result.java b/awsapi/src/com/amazon/s3/Result.java
index b2f76fa..6bcae8b 100644
--- a/awsapi/src/com/amazon/s3/Result.java
+++ b/awsapi/src/com/amazon/s3/Result.java
@@ -101,7 +101,8 @@ public class Result implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -155,9 +156,8 @@ public class Result implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/SetBucketAccessControlPolicy.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/SetBucketAccessControlPolicy.java b/awsapi/src/com/amazon/s3/SetBucketAccessControlPolicy.java
index 6e07a05..067bac2 100644
--- a/awsapi/src/com/amazon/s3/SetBucketAccessControlPolicy.java
+++ b/awsapi/src/com/amazon/s3/SetBucketAccessControlPolicy.java
@@ -30,7 +30,8 @@ package com.amazon.s3;
public class SetBucketAccessControlPolicy implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetBucketAccessControlPolicy", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetBucketAccessControlPolicy",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) {
@@ -288,7 +289,8 @@ public class SetBucketAccessControlPolicy implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -506,9 +508,8 @@ public class SetBucketAccessControlPolicy implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/SetBucketAccessControlPolicyResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/SetBucketAccessControlPolicyResponse.java b/awsapi/src/com/amazon/s3/SetBucketAccessControlPolicyResponse.java
index 16b67bb..ebefec2 100644
--- a/awsapi/src/com/amazon/s3/SetBucketAccessControlPolicyResponse.java
+++ b/awsapi/src/com/amazon/s3/SetBucketAccessControlPolicyResponse.java
@@ -30,7 +30,8 @@ package com.amazon.s3;
public class SetBucketAccessControlPolicyResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetBucketAccessControlPolicyResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/",
+ "SetBucketAccessControlPolicyResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) {
@@ -74,7 +75,8 @@ public class SetBucketAccessControlPolicyResponse implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -123,9 +125,8 @@ public class SetBucketAccessControlPolicyResponse implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/SetBucketLoggingStatus.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/SetBucketLoggingStatus.java b/awsapi/src/com/amazon/s3/SetBucketLoggingStatus.java
index 5cc11ad..3ccf915 100644
--- a/awsapi/src/com/amazon/s3/SetBucketLoggingStatus.java
+++ b/awsapi/src/com/amazon/s3/SetBucketLoggingStatus.java
@@ -274,7 +274,8 @@ public class SetBucketLoggingStatus implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -491,9 +492,8 @@ public class SetBucketLoggingStatus implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/SetBucketLoggingStatusResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/SetBucketLoggingStatusResponse.java b/awsapi/src/com/amazon/s3/SetBucketLoggingStatusResponse.java
index 693109b..3ad6d22 100644
--- a/awsapi/src/com/amazon/s3/SetBucketLoggingStatusResponse.java
+++ b/awsapi/src/com/amazon/s3/SetBucketLoggingStatusResponse.java
@@ -30,7 +30,8 @@ package com.amazon.s3;
public class SetBucketLoggingStatusResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetBucketLoggingStatusResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetBucketLoggingStatusResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) {
@@ -74,7 +75,8 @@ public class SetBucketLoggingStatusResponse implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -123,9 +125,8 @@ public class SetBucketLoggingStatusResponse implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/SetObjectAccessControlPolicy.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/SetObjectAccessControlPolicy.java b/awsapi/src/com/amazon/s3/SetObjectAccessControlPolicy.java
index 87ce0d3..c338402 100644
--- a/awsapi/src/com/amazon/s3/SetObjectAccessControlPolicy.java
+++ b/awsapi/src/com/amazon/s3/SetObjectAccessControlPolicy.java
@@ -30,7 +30,8 @@ package com.amazon.s3;
public class SetObjectAccessControlPolicy implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetObjectAccessControlPolicy", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetObjectAccessControlPolicy",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) {
@@ -298,7 +299,8 @@ public class SetObjectAccessControlPolicy implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -547,9 +549,8 @@ public class SetObjectAccessControlPolicy implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/SetObjectAccessControlPolicyResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/SetObjectAccessControlPolicyResponse.java b/awsapi/src/com/amazon/s3/SetObjectAccessControlPolicyResponse.java
index c90ab64..6c157e0 100644
--- a/awsapi/src/com/amazon/s3/SetObjectAccessControlPolicyResponse.java
+++ b/awsapi/src/com/amazon/s3/SetObjectAccessControlPolicyResponse.java
@@ -30,7 +30,8 @@ package com.amazon.s3;
public class SetObjectAccessControlPolicyResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetObjectAccessControlPolicyResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/",
+ "SetObjectAccessControlPolicyResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) {
@@ -74,7 +75,8 @@ public class SetObjectAccessControlPolicyResponse implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -123,9 +125,8 @@ public class SetObjectAccessControlPolicyResponse implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
[24/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponseType.java
index 9b0ca7f..58965f4 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponseType.java
@@ -125,7 +125,8 @@ public class DescribeVpnGatewaysResponseType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeVpnGatewaysResponseType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysType.java b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysType.java
index 6e55c07..095b108 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysType.java
@@ -153,7 +153,8 @@ public class DescribeVpnGatewaysType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -213,9 +214,8 @@ public class DescribeVpnGatewaysType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DetachInternetGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachInternetGateway.java b/awsapi/src/com/amazon/ec2/DetachInternetGateway.java
index 03374a2..e2df684 100644
--- a/awsapi/src/com/amazon/ec2/DetachInternetGateway.java
+++ b/awsapi/src/com/amazon/ec2/DetachInternetGateway.java
@@ -98,7 +98,8 @@ public class DetachInternetGateway implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DetachInternetGateway implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DetachInternetGateway implements org.apache.axis2.databinding.ADBBe
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachInternetGateway").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachInternetGateway").equals(reader.getName())) {
object.setDetachInternetGateway(com.amazon.ec2.DetachInternetGatewayType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponse.java b/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponse.java
index 9c3d0a6..3a0dd3e 100644
--- a/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DetachInternetGatewayResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachInternetGatewayResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachInternetGatewayResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DetachInternetGatewayResponse implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DetachInternetGatewayResponse implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponseType.java b/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponseType.java
index bd9d753..2f3c8a9 100644
--- a/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponseType.java
@@ -125,7 +125,8 @@ public class DetachInternetGatewayResponseType implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DetachInternetGatewayResponseType implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DetachInternetGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachInternetGatewayType.java b/awsapi/src/com/amazon/ec2/DetachInternetGatewayType.java
index 8eea00d..1f90350 100644
--- a/awsapi/src/com/amazon/ec2/DetachInternetGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/DetachInternetGatewayType.java
@@ -125,7 +125,8 @@ public class DetachInternetGatewayType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class DetachInternetGatewayType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DetachNetworkInterface.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachNetworkInterface.java b/awsapi/src/com/amazon/ec2/DetachNetworkInterface.java
index 4416feb..a96834e 100644
--- a/awsapi/src/com/amazon/ec2/DetachNetworkInterface.java
+++ b/awsapi/src/com/amazon/ec2/DetachNetworkInterface.java
@@ -98,7 +98,8 @@ public class DetachNetworkInterface implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DetachNetworkInterface implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DetachNetworkInterface implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachNetworkInterface").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachNetworkInterface").equals(reader.getName())) {
object.setDetachNetworkInterface(com.amazon.ec2.DetachNetworkInterfaceType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponse.java b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponse.java
index 1dfdccf..f8fac29 100644
--- a/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponse.java
+++ b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DetachNetworkInterfaceResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachNetworkInterfaceResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachNetworkInterfaceResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DetachNetworkInterfaceResponse implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DetachNetworkInterfaceResponse implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponseType.java b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponseType.java
index adfc9c9..d5720e9 100644
--- a/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponseType.java
@@ -125,7 +125,8 @@ public class DetachNetworkInterfaceResponseType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DetachNetworkInterfaceResponseType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceType.java b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceType.java
index d6cee63..1ab1b3b 100644
--- a/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceType.java
+++ b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceType.java
@@ -140,7 +140,8 @@ public class DetachNetworkInterfaceType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -250,9 +251,8 @@ public class DetachNetworkInterfaceType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DetachVolume.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachVolume.java b/awsapi/src/com/amazon/ec2/DetachVolume.java
index a31e578..351cc76 100644
--- a/awsapi/src/com/amazon/ec2/DetachVolume.java
+++ b/awsapi/src/com/amazon/ec2/DetachVolume.java
@@ -98,7 +98,8 @@ public class DetachVolume implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DetachVolume implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DetachVolumeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachVolumeResponse.java b/awsapi/src/com/amazon/ec2/DetachVolumeResponse.java
index 740f9ed..3d188a2 100644
--- a/awsapi/src/com/amazon/ec2/DetachVolumeResponse.java
+++ b/awsapi/src/com/amazon/ec2/DetachVolumeResponse.java
@@ -98,7 +98,8 @@ public class DetachVolumeResponse implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DetachVolumeResponse implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DetachVolumeResponse implements org.apache.axis2.databinding.ADBBea
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachVolumeResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachVolumeResponse").equals(reader.getName())) {
object.setDetachVolumeResponse(com.amazon.ec2.DetachVolumeResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DetachVolumeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachVolumeResponseType.java b/awsapi/src/com/amazon/ec2/DetachVolumeResponseType.java
index 4e43b64..968f92e 100644
--- a/awsapi/src/com/amazon/ec2/DetachVolumeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DetachVolumeResponseType.java
@@ -221,7 +221,8 @@ public class DetachVolumeResponseType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -462,9 +463,8 @@ public class DetachVolumeResponseType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DetachVolumeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachVolumeType.java b/awsapi/src/com/amazon/ec2/DetachVolumeType.java
index 31a1615..20e7d40 100644
--- a/awsapi/src/com/amazon/ec2/DetachVolumeType.java
+++ b/awsapi/src/com/amazon/ec2/DetachVolumeType.java
@@ -216,7 +216,8 @@ public class DetachVolumeType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -392,9 +393,8 @@ public class DetachVolumeType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DetachVpnGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachVpnGateway.java b/awsapi/src/com/amazon/ec2/DetachVpnGateway.java
index 8a5ba90..d61b9a8 100644
--- a/awsapi/src/com/amazon/ec2/DetachVpnGateway.java
+++ b/awsapi/src/com/amazon/ec2/DetachVpnGateway.java
@@ -98,7 +98,8 @@ public class DetachVpnGateway implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DetachVpnGateway implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DetachVpnGateway implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachVpnGateway").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachVpnGateway").equals(reader.getName())) {
object.setDetachVpnGateway(com.amazon.ec2.DetachVpnGatewayType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponse.java b/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponse.java
index eecc01a..31ad0e4 100644
--- a/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponse.java
@@ -98,7 +98,8 @@ public class DetachVpnGatewayResponse implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DetachVpnGatewayResponse implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponseType.java b/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponseType.java
index 82a635a..5042fa8 100644
--- a/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponseType.java
@@ -125,7 +125,8 @@ public class DetachVpnGatewayResponseType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DetachVpnGatewayResponseType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DetachVpnGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DetachVpnGatewayType.java b/awsapi/src/com/amazon/ec2/DetachVpnGatewayType.java
index 916d430..505c74b 100644
--- a/awsapi/src/com/amazon/ec2/DetachVpnGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/DetachVpnGatewayType.java
@@ -125,7 +125,8 @@ public class DetachVpnGatewayType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class DetachVpnGatewayType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DhcpConfigurationItemSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DhcpConfigurationItemSetType.java b/awsapi/src/com/amazon/ec2/DhcpConfigurationItemSetType.java
index a47ac9d..c2e12c0 100644
--- a/awsapi/src/com/amazon/ec2/DhcpConfigurationItemSetType.java
+++ b/awsapi/src/com/amazon/ec2/DhcpConfigurationItemSetType.java
@@ -142,7 +142,8 @@ public class DhcpConfigurationItemSetType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DhcpConfigurationItemSetType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DhcpConfigurationItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DhcpConfigurationItemType.java b/awsapi/src/com/amazon/ec2/DhcpConfigurationItemType.java
index 45151cb..7534698 100644
--- a/awsapi/src/com/amazon/ec2/DhcpConfigurationItemType.java
+++ b/awsapi/src/com/amazon/ec2/DhcpConfigurationItemType.java
@@ -125,7 +125,8 @@ public class DhcpConfigurationItemType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DhcpConfigurationItemType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetItemType.java b/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetItemType.java
index 13d2890..ec64319 100644
--- a/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetItemType.java
@@ -101,7 +101,8 @@ public class DhcpOptionsIdSetItemType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DhcpOptionsIdSetItemType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetType.java b/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetType.java
index e5d1685..982da9f 100644
--- a/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetType.java
@@ -142,7 +142,8 @@ public class DhcpOptionsIdSetType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DhcpOptionsIdSetType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DhcpOptionsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DhcpOptionsSetType.java b/awsapi/src/com/amazon/ec2/DhcpOptionsSetType.java
index 3e9e29b..732a930 100644
--- a/awsapi/src/com/amazon/ec2/DhcpOptionsSetType.java
+++ b/awsapi/src/com/amazon/ec2/DhcpOptionsSetType.java
@@ -142,7 +142,8 @@ public class DhcpOptionsSetType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DhcpOptionsSetType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,7 +463,8 @@ public class DhcpOptionsSetType implements org.apache.axis2.databinding.ADBBean
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.DhcpOptionsType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.DhcpOptionsType.class, list1));
+ object.setItem((com.amazon.ec2.DhcpOptionsType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+ com.amazon.ec2.DhcpOptionsType.class, list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DhcpOptionsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DhcpOptionsType.java b/awsapi/src/com/amazon/ec2/DhcpOptionsType.java
index eda0a0d..cf11e64 100644
--- a/awsapi/src/com/amazon/ec2/DhcpOptionsType.java
+++ b/awsapi/src/com/amazon/ec2/DhcpOptionsType.java
@@ -163,7 +163,8 @@ public class DhcpOptionsType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -254,9 +255,8 @@ public class DhcpOptionsType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DhcpValueSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DhcpValueSetType.java b/awsapi/src/com/amazon/ec2/DhcpValueSetType.java
index 097507c..77565c5 100644
--- a/awsapi/src/com/amazon/ec2/DhcpValueSetType.java
+++ b/awsapi/src/com/amazon/ec2/DhcpValueSetType.java
@@ -142,7 +142,8 @@ public class DhcpValueSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DhcpValueSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,7 +463,8 @@ public class DhcpValueSetType implements org.apache.axis2.databinding.ADBBean {
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.DhcpValueType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.DhcpValueType.class, list1));
+ object.setItem((com.amazon.ec2.DhcpValueType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.DhcpValueType.class,
+ list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DhcpValueType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DhcpValueType.java b/awsapi/src/com/amazon/ec2/DhcpValueType.java
index c0c8fea..3c9c1fb 100644
--- a/awsapi/src/com/amazon/ec2/DhcpValueType.java
+++ b/awsapi/src/com/amazon/ec2/DhcpValueType.java
@@ -101,7 +101,8 @@ public class DhcpValueType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DhcpValueType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagation.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagation.java b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagation.java
index 610aaf5..4629a7a 100644
--- a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagation.java
+++ b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagation.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DisableVgwRoutePropagation implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisableVgwRoutePropagation", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisableVgwRoutePropagation",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DisableVgwRoutePropagation implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DisableVgwRoutePropagation implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationRequestType.java b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationRequestType.java
index 0480f6e..7687744 100644
--- a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationRequestType.java
+++ b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationRequestType.java
@@ -125,7 +125,8 @@ public class DisableVgwRoutePropagationRequestType implements org.apache.axis2.d
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class DisableVgwRoutePropagationRequestType implements org.apache.axis2.d
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponse.java b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponse.java
index 976edf6..c5d72302 100644
--- a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponse.java
+++ b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DisableVgwRoutePropagationResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisableVgwRoutePropagationResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "DisableVgwRoutePropagationResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DisableVgwRoutePropagationResponse implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DisableVgwRoutePropagationResponse implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponseType.java b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponseType.java
index adc9113..69ed784 100644
--- a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponseType.java
@@ -125,7 +125,8 @@ public class DisableVgwRoutePropagationResponseType implements org.apache.axis2.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DisableVgwRoutePropagationResponseType implements org.apache.axis2.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DisassociateAddress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisassociateAddress.java b/awsapi/src/com/amazon/ec2/DisassociateAddress.java
index aa27039..255bb18 100644
--- a/awsapi/src/com/amazon/ec2/DisassociateAddress.java
+++ b/awsapi/src/com/amazon/ec2/DisassociateAddress.java
@@ -98,7 +98,8 @@ public class DisassociateAddress implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DisassociateAddress implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DisassociateAddress implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateAddress").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateAddress").equals(reader.getName())) {
object.setDisassociateAddress(com.amazon.ec2.DisassociateAddressType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DisassociateAddressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisassociateAddressResponse.java b/awsapi/src/com/amazon/ec2/DisassociateAddressResponse.java
index b4e9390..c383368 100644
--- a/awsapi/src/com/amazon/ec2/DisassociateAddressResponse.java
+++ b/awsapi/src/com/amazon/ec2/DisassociateAddressResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DisassociateAddressResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateAddressResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateAddressResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DisassociateAddressResponse implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DisassociateAddressResponse implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DisassociateAddressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisassociateAddressResponseType.java b/awsapi/src/com/amazon/ec2/DisassociateAddressResponseType.java
index 6353e82..cb2fd97 100644
--- a/awsapi/src/com/amazon/ec2/DisassociateAddressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DisassociateAddressResponseType.java
@@ -125,7 +125,8 @@ public class DisassociateAddressResponseType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DisassociateAddressResponseType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DisassociateAddressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisassociateAddressType.java b/awsapi/src/com/amazon/ec2/DisassociateAddressType.java
index eee60f3..986e751 100644
--- a/awsapi/src/com/amazon/ec2/DisassociateAddressType.java
+++ b/awsapi/src/com/amazon/ec2/DisassociateAddressType.java
@@ -168,7 +168,8 @@ public class DisassociateAddressType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -282,9 +283,8 @@ public class DisassociateAddressType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -514,7 +514,8 @@ public class DisassociateAddressType implements org.apache.axis2.databinding.ADB
else
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "associationId").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "associationId").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DisassociateRouteTable.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisassociateRouteTable.java b/awsapi/src/com/amazon/ec2/DisassociateRouteTable.java
index 01d2c5e..51df82d 100644
--- a/awsapi/src/com/amazon/ec2/DisassociateRouteTable.java
+++ b/awsapi/src/com/amazon/ec2/DisassociateRouteTable.java
@@ -98,7 +98,8 @@ public class DisassociateRouteTable implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DisassociateRouteTable implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DisassociateRouteTable implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateRouteTable").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateRouteTable").equals(reader.getName())) {
object.setDisassociateRouteTable(com.amazon.ec2.DisassociateRouteTableType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponse.java b/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponse.java
index 74e66fc..95b1ee3 100644
--- a/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponse.java
+++ b/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DisassociateRouteTableResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateRouteTableResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateRouteTableResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DisassociateRouteTableResponse implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DisassociateRouteTableResponse implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponseType.java b/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponseType.java
index dc1a8fd..bf752be 100644
--- a/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponseType.java
@@ -125,7 +125,8 @@ public class DisassociateRouteTableResponseType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DisassociateRouteTableResponseType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DisassociateRouteTableType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DisassociateRouteTableType.java b/awsapi/src/com/amazon/ec2/DisassociateRouteTableType.java
index b2cd6ec..2949ff5 100644
--- a/awsapi/src/com/amazon/ec2/DisassociateRouteTableType.java
+++ b/awsapi/src/com/amazon/ec2/DisassociateRouteTableType.java
@@ -101,7 +101,8 @@ public class DisassociateRouteTableType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DisassociateRouteTableType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DiskImageDescriptionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DiskImageDescriptionType.java b/awsapi/src/com/amazon/ec2/DiskImageDescriptionType.java
index c09c749..c5597cc 100644
--- a/awsapi/src/com/amazon/ec2/DiskImageDescriptionType.java
+++ b/awsapi/src/com/amazon/ec2/DiskImageDescriptionType.java
@@ -187,7 +187,8 @@ public class DiskImageDescriptionType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -361,9 +362,8 @@ public class DiskImageDescriptionType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DiskImageDetailType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DiskImageDetailType.java b/awsapi/src/com/amazon/ec2/DiskImageDetailType.java
index f961880..43f584b 100644
--- a/awsapi/src/com/amazon/ec2/DiskImageDetailType.java
+++ b/awsapi/src/com/amazon/ec2/DiskImageDetailType.java
@@ -149,7 +149,8 @@ public class DiskImageDetailType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -291,9 +292,8 @@ public class DiskImageDetailType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
[25/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistory.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistory.java b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistory.java
index 75ec8f7..1118e92 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistory.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistory.java
@@ -98,7 +98,8 @@ public class DescribeSpotPriceHistory implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeSpotPriceHistory implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponse.java b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponse.java
index e8fda9c..70a4c30 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeSpotPriceHistoryResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSpotPriceHistoryResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "DescribeSpotPriceHistoryResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeSpotPriceHistoryResponse implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeSpotPriceHistoryResponse implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponseType.java
index 8bc1dde..9dfebce 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponseType.java
@@ -163,7 +163,8 @@ public class DescribeSpotPriceHistoryResponseType implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -281,9 +282,8 @@ public class DescribeSpotPriceHistoryResponseType implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryType.java b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryType.java
index f5343d7..34bf7c9 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryType.java
@@ -381,7 +381,8 @@ public class DescribeSpotPriceHistoryType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -612,9 +613,8 @@ public class DescribeSpotPriceHistoryType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -932,7 +932,8 @@ public class DescribeSpotPriceHistoryType implements org.apache.axis2.databindin
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescriptionSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescriptionSet").equals(reader.getName())) {
object.setProductDescriptionSet(com.amazon.ec2.ProductDescriptionSetType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSubnets.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSubnets.java b/awsapi/src/com/amazon/ec2/DescribeSubnets.java
index bd519f9..586deaf 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSubnets.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSubnets.java
@@ -98,7 +98,8 @@ public class DescribeSubnets implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeSubnets implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeSubnets implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSubnets").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSubnets").equals(reader.getName())) {
object.setDescribeSubnets(com.amazon.ec2.DescribeSubnetsType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSubnetsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSubnetsResponse.java b/awsapi/src/com/amazon/ec2/DescribeSubnetsResponse.java
index 61afe8d..aae38ec 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSubnetsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSubnetsResponse.java
@@ -98,7 +98,8 @@ public class DescribeSubnetsResponse implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeSubnetsResponse implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSubnetsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSubnetsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSubnetsResponseType.java
index 2c3092c..160d7da 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSubnetsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSubnetsResponseType.java
@@ -125,7 +125,8 @@ public class DescribeSubnetsResponseType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeSubnetsResponseType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSubnetsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSubnetsType.java b/awsapi/src/com/amazon/ec2/DescribeSubnetsType.java
index 023940a..dcf9676 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSubnetsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSubnetsType.java
@@ -153,7 +153,8 @@ public class DescribeSubnetsType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -213,9 +214,8 @@ public class DescribeSubnetsType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeTags.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeTags.java b/awsapi/src/com/amazon/ec2/DescribeTags.java
index a0c517b..a535b50 100644
--- a/awsapi/src/com/amazon/ec2/DescribeTags.java
+++ b/awsapi/src/com/amazon/ec2/DescribeTags.java
@@ -98,7 +98,8 @@ public class DescribeTags implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeTags implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeTagsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeTagsResponse.java b/awsapi/src/com/amazon/ec2/DescribeTagsResponse.java
index 14d4529..b86f743 100644
--- a/awsapi/src/com/amazon/ec2/DescribeTagsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeTagsResponse.java
@@ -98,7 +98,8 @@ public class DescribeTagsResponse implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeTagsResponse implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeTagsResponse implements org.apache.axis2.databinding.ADBBea
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeTagsResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeTagsResponse").equals(reader.getName())) {
object.setDescribeTagsResponse(com.amazon.ec2.DescribeTagsResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeTagsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeTagsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeTagsResponseType.java
index b9f7cb6..ca15546 100644
--- a/awsapi/src/com/amazon/ec2/DescribeTagsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeTagsResponseType.java
@@ -125,7 +125,8 @@ public class DescribeTagsResponseType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeTagsResponseType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeTagsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeTagsType.java b/awsapi/src/com/amazon/ec2/DescribeTagsType.java
index fe3bb33..b8c7f70 100644
--- a/awsapi/src/com/amazon/ec2/DescribeTagsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeTagsType.java
@@ -115,7 +115,8 @@ public class DescribeTagsType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -169,9 +170,8 @@ public class DescribeTagsType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVolumeAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeAttribute.java b/awsapi/src/com/amazon/ec2/DescribeVolumeAttribute.java
index 3d26b86..3ffa015 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeAttribute.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeAttribute.java
@@ -98,7 +98,8 @@ public class DescribeVolumeAttribute implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeVolumeAttribute implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponse.java b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponse.java
index 11a0f05..84685c0 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeVolumeAttributeResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumeAttributeResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumeAttributeResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeVolumeAttributeResponse implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeVolumeAttributeResponse implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseType.java
index f817bab..809af57 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseType.java
@@ -149,7 +149,8 @@ public class DescribeVolumeAttributeResponseType implements org.apache.axis2.dat
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -267,9 +268,8 @@ public class DescribeVolumeAttributeResponseType implements org.apache.axis2.dat
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseTypeChoice_type0.java
index 474da7d..2f35ef9 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseTypeChoice_type0.java
@@ -168,7 +168,8 @@ public class DescribeVolumeAttributeResponseTypeChoice_type0 implements org.apac
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -183,7 +184,8 @@ public class DescribeVolumeAttributeResponseTypeChoice_type0 implements org.apac
java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/");
if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) {
- writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeVolumeAttributeResponseTypeChoice_type0", xmlWriter);
+ writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeVolumeAttributeResponseTypeChoice_type0",
+ xmlWriter);
} else {
writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeVolumeAttributeResponseTypeChoice_type0", xmlWriter);
}
@@ -207,9 +209,8 @@ public class DescribeVolumeAttributeResponseTypeChoice_type0 implements org.apac
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeType.java b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeType.java
index 3118245..3737578 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeType.java
@@ -125,7 +125,8 @@ public class DescribeVolumeAttributeType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeVolumeAttributeType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributesGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributesGroup.java b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributesGroup.java
index 308c66b..6b1aa40 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributesGroup.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributesGroup.java
@@ -168,7 +168,8 @@ public class DescribeVolumeAttributesGroup implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -207,9 +208,8 @@ public class DescribeVolumeAttributesGroup implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVolumeStatus.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeStatus.java b/awsapi/src/com/amazon/ec2/DescribeVolumeStatus.java
index 61aebfd..f55da52 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeStatus.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeStatus.java
@@ -98,7 +98,8 @@ public class DescribeVolumeStatus implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeVolumeStatus implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeVolumeStatus implements org.apache.axis2.databinding.ADBBea
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumeStatus").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumeStatus").equals(reader.getName())) {
object.setDescribeVolumeStatus(com.amazon.ec2.DescribeVolumeStatusType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponse.java b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponse.java
index cd9fdb6..ba8007f 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeVolumeStatusResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumeStatusResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumeStatusResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeVolumeStatusResponse implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeVolumeStatusResponse implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponseType.java
index 846a878..9530535 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponseType.java
@@ -163,7 +163,8 @@ public class DescribeVolumeStatusResponseType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -281,9 +282,8 @@ public class DescribeVolumeStatusResponseType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeStatusType.java b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusType.java
index 12a73a5..4b67d0e 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumeStatusType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusType.java
@@ -215,7 +215,8 @@ public class DescribeVolumeStatusType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -340,9 +341,8 @@ public class DescribeVolumeStatusType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVolumes.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumes.java b/awsapi/src/com/amazon/ec2/DescribeVolumes.java
index 280cd2d..4f1b1b7 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumes.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumes.java
@@ -98,7 +98,8 @@ public class DescribeVolumes implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeVolumes implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeVolumes implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumes").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumes").equals(reader.getName())) {
object.setDescribeVolumes(com.amazon.ec2.DescribeVolumesType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVolumesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesResponse.java b/awsapi/src/com/amazon/ec2/DescribeVolumesResponse.java
index 5b7a1b3..0d90c93 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumesResponse.java
@@ -98,7 +98,8 @@ public class DescribeVolumesResponse implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeVolumesResponse implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVolumesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVolumesResponseType.java
index 52b6e39..f28fac6 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumesResponseType.java
@@ -125,7 +125,8 @@ public class DescribeVolumesResponseType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeVolumesResponseType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemResponseType.java
index 4be8c99..621633a 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemResponseType.java
@@ -346,7 +346,8 @@ public class DescribeVolumesSetItemResponseType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -658,9 +659,8 @@ public class DescribeVolumesSetItemResponseType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemType.java
index 3117c92..8a94967 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemType.java
@@ -101,7 +101,8 @@ public class DescribeVolumesSetItemType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DescribeVolumesSetItemType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVolumesSetResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesSetResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVolumesSetResponseType.java
index 754fd88..9a8d177 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumesSetResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumesSetResponseType.java
@@ -142,7 +142,8 @@ public class DescribeVolumesSetResponseType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeVolumesSetResponseType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVolumesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesSetType.java b/awsapi/src/com/amazon/ec2/DescribeVolumesSetType.java
index 6012bd0..59cc09e 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumesSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumesSetType.java
@@ -142,7 +142,8 @@ public class DescribeVolumesSetType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeVolumesSetType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVolumesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesType.java b/awsapi/src/com/amazon/ec2/DescribeVolumesType.java
index 155ea45..f04f498 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVolumesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVolumesType.java
@@ -139,7 +139,8 @@ public class DescribeVolumesType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -198,9 +199,8 @@ public class DescribeVolumesType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVpcs.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpcs.java b/awsapi/src/com/amazon/ec2/DescribeVpcs.java
index 77f0251..53228aa 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpcs.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpcs.java
@@ -98,7 +98,8 @@ public class DescribeVpcs implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeVpcs implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVpcsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpcsResponse.java b/awsapi/src/com/amazon/ec2/DescribeVpcsResponse.java
index 668d3cb..10e4a32 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpcsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpcsResponse.java
@@ -98,7 +98,8 @@ public class DescribeVpcsResponse implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeVpcsResponse implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeVpcsResponse implements org.apache.axis2.databinding.ADBBea
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpcsResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpcsResponse").equals(reader.getName())) {
object.setDescribeVpcsResponse(com.amazon.ec2.DescribeVpcsResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVpcsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpcsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVpcsResponseType.java
index 3ea8e2e..6fb5cb7 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpcsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpcsResponseType.java
@@ -125,7 +125,8 @@ public class DescribeVpcsResponseType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeVpcsResponseType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVpcsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpcsType.java b/awsapi/src/com/amazon/ec2/DescribeVpcsType.java
index 7d6114d..82166e3 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpcsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpcsType.java
@@ -153,7 +153,8 @@ public class DescribeVpcsType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -213,9 +214,8 @@ public class DescribeVpcsType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVpnConnections.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnConnections.java b/awsapi/src/com/amazon/ec2/DescribeVpnConnections.java
index 23a435b..cee1a8a 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpnConnections.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpnConnections.java
@@ -98,7 +98,8 @@ public class DescribeVpnConnections implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeVpnConnections implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeVpnConnections implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnConnections").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnConnections").equals(reader.getName())) {
object.setDescribeVpnConnections(com.amazon.ec2.DescribeVpnConnectionsType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponse.java b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponse.java
index 439d5d7..34381ed 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeVpnConnectionsResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnConnectionsResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnConnectionsResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeVpnConnectionsResponse implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeVpnConnectionsResponse implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponseType.java
index 17838bd..599aac9 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponseType.java
@@ -125,7 +125,8 @@ public class DescribeVpnConnectionsResponseType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeVpnConnectionsResponseType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsType.java b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsType.java
index b743bab..5d5a79e 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsType.java
@@ -153,7 +153,8 @@ public class DescribeVpnConnectionsType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -213,9 +214,8 @@ public class DescribeVpnConnectionsType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVpnGateways.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnGateways.java b/awsapi/src/com/amazon/ec2/DescribeVpnGateways.java
index d7e3499..46b86f0 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpnGateways.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpnGateways.java
@@ -98,7 +98,8 @@ public class DescribeVpnGateways implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeVpnGateways implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeVpnGateways implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnGateways").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnGateways").equals(reader.getName())) {
object.setDescribeVpnGateways(com.amazon.ec2.DescribeVpnGatewaysType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponse.java b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponse.java
index e548164..57b0700 100644
--- a/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeVpnGatewaysResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnGatewaysResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnGatewaysResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeVpnGatewaysResponse implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeVpnGatewaysResponse implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
[37/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java b/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java
index ec0f982..99834a4 100644
--- a/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java
+++ b/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java
@@ -56,7 +56,8 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface {
* @param resetNetworkInterfaceAttribute4
*/
- public com.amazon.ec2.ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttribute(com.amazon.ec2.ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute4) {
+ public com.amazon.ec2.ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttribute(
+ com.amazon.ec2.ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute4) {
//TODO : fill this with the necessary business logic
throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#resetNetworkInterfaceAttribute");
}
@@ -320,7 +321,8 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface {
* @param authorizeSecurityGroupIngress52
*/
- public com.amazon.ec2.AuthorizeSecurityGroupIngressResponse authorizeSecurityGroupIngress(com.amazon.ec2.AuthorizeSecurityGroupIngress authorizeSecurityGroupIngress52) {
+ public com.amazon.ec2.AuthorizeSecurityGroupIngressResponse
+ authorizeSecurityGroupIngress(com.amazon.ec2.AuthorizeSecurityGroupIngress authorizeSecurityGroupIngress52) {
//TODO : fill this with the necessary business logic
throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#authorizeSecurityGroupIngress");
}
@@ -574,7 +576,8 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface {
* @param createReservedInstancesListing98
*/
- public com.amazon.ec2.CreateReservedInstancesListingResponse createReservedInstancesListing(com.amazon.ec2.CreateReservedInstancesListing createReservedInstancesListing98) {
+ public com.amazon.ec2.CreateReservedInstancesListingResponse createReservedInstancesListing(
+ com.amazon.ec2.CreateReservedInstancesListing createReservedInstancesListing98) {
//TODO : fill this with the necessary business logic
throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createReservedInstancesListing");
}
@@ -849,7 +852,8 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface {
* @param cancelReservedInstancesListing148
*/
- public com.amazon.ec2.CancelReservedInstancesListingResponse cancelReservedInstancesListing(com.amazon.ec2.CancelReservedInstancesListing cancelReservedInstancesListing148) {
+ public com.amazon.ec2.CancelReservedInstancesListingResponse cancelReservedInstancesListing(
+ com.amazon.ec2.CancelReservedInstancesListing cancelReservedInstancesListing148) {
//TODO : fill this with the necessary business logic
throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#cancelReservedInstancesListing");
}
@@ -993,7 +997,8 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface {
* @param createSpotDatafeedSubscription174
*/
- public com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse createSpotDatafeedSubscription(com.amazon.ec2.CreateSpotDatafeedSubscription createSpotDatafeedSubscription174) {
+ public com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse createSpotDatafeedSubscription(
+ com.amazon.ec2.CreateSpotDatafeedSubscription createSpotDatafeedSubscription174) {
//TODO : fill this with the necessary business logic
throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createSpotDatafeedSubscription");
}
@@ -1027,8 +1032,8 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface {
* @param modifyNetworkInterfaceAttribute180
*/
- public com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse
- modifyNetworkInterfaceAttribute(com.amazon.ec2.ModifyNetworkInterfaceAttribute modifyNetworkInterfaceAttribute180) {
+ public com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse modifyNetworkInterfaceAttribute(
+ com.amazon.ec2.ModifyNetworkInterfaceAttribute modifyNetworkInterfaceAttribute180) {
//TODO : fill this with the necessary business logic
throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#modifyNetworkInterfaceAttribute");
}
@@ -1525,7 +1530,8 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface {
* @param deleteSpotDatafeedSubscription270
*/
- public com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponse deleteSpotDatafeedSubscription(com.amazon.ec2.DeleteSpotDatafeedSubscription deleteSpotDatafeedSubscription270) {
+ public com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponse deleteSpotDatafeedSubscription(
+ com.amazon.ec2.DeleteSpotDatafeedSubscription deleteSpotDatafeedSubscription270) {
//TODO : fill this with the necessary business logic
throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteSpotDatafeedSubscription");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java b/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java
index 40f1113..77dd851 100644
--- a/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java
+++ b/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java
@@ -50,7 +50,8 @@ public interface AmazonEC2SkeletonInterface {
* @param resetNetworkInterfaceAttribute
*/
- public com.amazon.ec2.ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttribute(com.amazon.ec2.ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute);
+ public com.amazon.ec2.ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttribute(
+ com.amazon.ec2.ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute);
/**
* Auto generated method signature
@@ -427,7 +428,8 @@ public interface AmazonEC2SkeletonInterface {
* @param createReservedInstancesListing
*/
- public com.amazon.ec2.CreateReservedInstancesListingResponse createReservedInstancesListing(com.amazon.ec2.CreateReservedInstancesListing createReservedInstancesListing);
+ public com.amazon.ec2.CreateReservedInstancesListingResponse createReservedInstancesListing(
+ com.amazon.ec2.CreateReservedInstancesListing createReservedInstancesListing);
/**
* Auto generated method signature
@@ -627,7 +629,8 @@ public interface AmazonEC2SkeletonInterface {
* @param cancelReservedInstancesListing
*/
- public com.amazon.ec2.CancelReservedInstancesListingResponse cancelReservedInstancesListing(com.amazon.ec2.CancelReservedInstancesListing cancelReservedInstancesListing);
+ public com.amazon.ec2.CancelReservedInstancesListingResponse cancelReservedInstancesListing(
+ com.amazon.ec2.CancelReservedInstancesListing cancelReservedInstancesListing);
/**
* Auto generated method signature
@@ -683,8 +686,8 @@ public interface AmazonEC2SkeletonInterface {
* @param describeSpotDatafeedSubscription
*/
- public com.amazon.ec2.DescribeSpotDatafeedSubscriptionResponse
- describeSpotDatafeedSubscription(com.amazon.ec2.DescribeSpotDatafeedSubscription describeSpotDatafeedSubscription);
+ public com.amazon.ec2.DescribeSpotDatafeedSubscriptionResponse describeSpotDatafeedSubscription(
+ com.amazon.ec2.DescribeSpotDatafeedSubscription describeSpotDatafeedSubscription);
/**
* Auto generated method signature
@@ -732,7 +735,8 @@ public interface AmazonEC2SkeletonInterface {
* @param createSpotDatafeedSubscription
*/
- public com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse createSpotDatafeedSubscription(com.amazon.ec2.CreateSpotDatafeedSubscription createSpotDatafeedSubscription);
+ public com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse createSpotDatafeedSubscription(
+ com.amazon.ec2.CreateSpotDatafeedSubscription createSpotDatafeedSubscription);
/**
* Auto generated method signature
@@ -757,7 +761,8 @@ public interface AmazonEC2SkeletonInterface {
* @param modifyNetworkInterfaceAttribute
*/
- public com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse modifyNetworkInterfaceAttribute(com.amazon.ec2.ModifyNetworkInterfaceAttribute modifyNetworkInterfaceAttribute);
+ public com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse modifyNetworkInterfaceAttribute(
+ com.amazon.ec2.ModifyNetworkInterfaceAttribute modifyNetworkInterfaceAttribute);
/**
* Auto generated method signature
@@ -1119,7 +1124,8 @@ public interface AmazonEC2SkeletonInterface {
* @param deleteSpotDatafeedSubscription
*/
- public com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponse deleteSpotDatafeedSubscription(com.amazon.ec2.DeleteSpotDatafeedSubscription deleteSpotDatafeedSubscription);
+ public com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponse deleteSpotDatafeedSubscription(
+ com.amazon.ec2.DeleteSpotDatafeedSubscription deleteSpotDatafeedSubscription);
/**
* Auto generated method signature
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddresses.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddresses.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddresses.java
index 23c2256..f07afd5 100644
--- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddresses.java
+++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddresses.java
@@ -98,7 +98,8 @@ public class AssignPrivateIpAddresses implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class AssignPrivateIpAddresses implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponse.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponse.java
index bad989b..dda95b4 100644
--- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponse.java
+++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class AssignPrivateIpAddressesResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssignPrivateIpAddressesResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "AssignPrivateIpAddressesResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class AssignPrivateIpAddressesResponse implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class AssignPrivateIpAddressesResponse implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponseType.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponseType.java
index f1e91f3..960ad3a 100644
--- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponseType.java
@@ -125,7 +125,8 @@ public class AssignPrivateIpAddressesResponseType implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class AssignPrivateIpAddressesResponseType implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetItemRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetItemRequestType.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetItemRequestType.java
index 16a3162..55365b1 100644
--- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetItemRequestType.java
+++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetItemRequestType.java
@@ -101,7 +101,8 @@ public class AssignPrivateIpAddressesSetItemRequestType implements org.apache.ax
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class AssignPrivateIpAddressesSetItemRequestType implements org.apache.ax
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetRequestType.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetRequestType.java
index f13cc85..bc65ea8 100644
--- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetRequestType.java
+++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetRequestType.java
@@ -90,7 +90,8 @@ public class AssignPrivateIpAddressesSetRequestType implements org.apache.axis2.
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem);
list.add(param);
- this.localItem = (com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType[])list.toArray(new com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType[list.size()]);
+ this.localItem =
+ (com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType[])list.toArray(new com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType[list.size()]);
}
@@ -129,7 +130,8 @@ public class AssignPrivateIpAddressesSetRequestType implements org.apache.axis2.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -195,9 +197,8 @@ public class AssignPrivateIpAddressesSetRequestType implements org.apache.axis2.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesType.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesType.java
index 79ac4ca..89d2201 100644
--- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesType.java
+++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesType.java
@@ -217,7 +217,8 @@ public class AssignPrivateIpAddressesType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -363,9 +364,8 @@ public class AssignPrivateIpAddressesType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -608,7 +608,8 @@ public class AssignPrivateIpAddressesType implements org.apache.axis2.databindin
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) {
object.setPrivateIpAddressesSet(com.amazon.ec2.AssignPrivateIpAddressesSetRequestType.Factory.parse(reader));
@@ -623,7 +624,8 @@ public class AssignPrivateIpAddressesType implements org.apache.axis2.databindin
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "secondaryPrivateIpAddressCount").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "secondaryPrivateIpAddressCount").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssociateAddress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddress.java b/awsapi/src/com/amazon/ec2/AssociateAddress.java
index b6cd735..6d2d1f9 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddress.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddress.java
@@ -98,7 +98,8 @@ public class AssociateAddress implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class AssociateAddress implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class AssociateAddress implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateAddress").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateAddress").equals(reader.getName())) {
object.setAssociateAddress(com.amazon.ec2.AssociateAddressType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java b/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java
index 314ee35..d372631 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java
@@ -98,7 +98,8 @@ public class AssociateAddressResponse implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class AssociateAddressResponse implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java b/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java
index 56cf087..274bdb9 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java
@@ -163,7 +163,8 @@ public class AssociateAddressResponseType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -305,9 +306,8 @@ public class AssociateAddressResponseType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssociateAddressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressType.java b/awsapi/src/com/amazon/ec2/AssociateAddressType.java
index 7107367..6df9c9b 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddressType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddressType.java
@@ -202,7 +202,8 @@ public class AssociateAddressType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -323,9 +324,8 @@ public class AssociateAddressType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type0.java
index e8a242a..9a1cfba 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type0.java
@@ -168,7 +168,8 @@ public class AssociateAddressTypeChoice_type0 implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -261,9 +262,8 @@ public class AssociateAddressTypeChoice_type0 implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type1.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type1.java b/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type1.java
index 30250d9..4ac01fe 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type1.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type1.java
@@ -168,7 +168,8 @@ public class AssociateAddressTypeChoice_type1 implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -261,9 +262,8 @@ public class AssociateAddressTypeChoice_type1 implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java
index f39f1a6..28875cd 100644
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java
+++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java
@@ -98,7 +98,8 @@ public class AssociateDhcpOptions implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class AssociateDhcpOptions implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class AssociateDhcpOptions implements org.apache.axis2.databinding.ADBBea
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateDhcpOptions").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateDhcpOptions").equals(reader.getName())) {
object.setAssociateDhcpOptions(com.amazon.ec2.AssociateDhcpOptionsType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java
index e5912cf..2bed734 100644
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java
+++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class AssociateDhcpOptionsResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateDhcpOptionsResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateDhcpOptionsResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class AssociateDhcpOptionsResponse implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class AssociateDhcpOptionsResponse implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java
index 9a07d34..98692a7 100644
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java
@@ -125,7 +125,8 @@ public class AssociateDhcpOptionsResponseType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class AssociateDhcpOptionsResponseType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java
index 6e88446..8190220 100644
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java
@@ -125,7 +125,8 @@ public class AssociateDhcpOptionsType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class AssociateDhcpOptionsType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssociateRouteTable.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateRouteTable.java b/awsapi/src/com/amazon/ec2/AssociateRouteTable.java
index 663a062..6a753f1 100644
--- a/awsapi/src/com/amazon/ec2/AssociateRouteTable.java
+++ b/awsapi/src/com/amazon/ec2/AssociateRouteTable.java
@@ -98,7 +98,8 @@ public class AssociateRouteTable implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class AssociateRouteTable implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class AssociateRouteTable implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateRouteTable").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateRouteTable").equals(reader.getName())) {
object.setAssociateRouteTable(com.amazon.ec2.AssociateRouteTableType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssociateRouteTableResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateRouteTableResponse.java b/awsapi/src/com/amazon/ec2/AssociateRouteTableResponse.java
index 2603242..8308945 100644
--- a/awsapi/src/com/amazon/ec2/AssociateRouteTableResponse.java
+++ b/awsapi/src/com/amazon/ec2/AssociateRouteTableResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class AssociateRouteTableResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateRouteTableResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateRouteTableResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class AssociateRouteTableResponse implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class AssociateRouteTableResponse implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssociateRouteTableResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateRouteTableResponseType.java b/awsapi/src/com/amazon/ec2/AssociateRouteTableResponseType.java
index d26e7c1..7a8cde1 100644
--- a/awsapi/src/com/amazon/ec2/AssociateRouteTableResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateRouteTableResponseType.java
@@ -125,7 +125,8 @@ public class AssociateRouteTableResponseType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class AssociateRouteTableResponseType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AssociateRouteTableType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateRouteTableType.java b/awsapi/src/com/amazon/ec2/AssociateRouteTableType.java
index 6d16c64..00d85ee 100644
--- a/awsapi/src/com/amazon/ec2/AssociateRouteTableType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateRouteTableType.java
@@ -125,7 +125,8 @@ public class AssociateRouteTableType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class AssociateRouteTableType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachInternetGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachInternetGateway.java b/awsapi/src/com/amazon/ec2/AttachInternetGateway.java
index d244777..b39ef3b 100644
--- a/awsapi/src/com/amazon/ec2/AttachInternetGateway.java
+++ b/awsapi/src/com/amazon/ec2/AttachInternetGateway.java
@@ -98,7 +98,8 @@ public class AttachInternetGateway implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class AttachInternetGateway implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class AttachInternetGateway implements org.apache.axis2.databinding.ADBBe
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachInternetGateway").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachInternetGateway").equals(reader.getName())) {
object.setAttachInternetGateway(com.amazon.ec2.AttachInternetGatewayType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponse.java b/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponse.java
index ce9cfc3..a765ed6 100644
--- a/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class AttachInternetGatewayResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachInternetGatewayResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachInternetGatewayResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class AttachInternetGatewayResponse implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class AttachInternetGatewayResponse implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponseType.java b/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponseType.java
index a3df51e..f3dee0e 100644
--- a/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponseType.java
@@ -125,7 +125,8 @@ public class AttachInternetGatewayResponseType implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class AttachInternetGatewayResponseType implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachInternetGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachInternetGatewayType.java b/awsapi/src/com/amazon/ec2/AttachInternetGatewayType.java
index 73ebb87..1d2b5b0 100644
--- a/awsapi/src/com/amazon/ec2/AttachInternetGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/AttachInternetGatewayType.java
@@ -125,7 +125,8 @@ public class AttachInternetGatewayType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class AttachInternetGatewayType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachNetworkInterface.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachNetworkInterface.java b/awsapi/src/com/amazon/ec2/AttachNetworkInterface.java
index 6596d21..2e4ae98 100644
--- a/awsapi/src/com/amazon/ec2/AttachNetworkInterface.java
+++ b/awsapi/src/com/amazon/ec2/AttachNetworkInterface.java
@@ -98,7 +98,8 @@ public class AttachNetworkInterface implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class AttachNetworkInterface implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class AttachNetworkInterface implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachNetworkInterface").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachNetworkInterface").equals(reader.getName())) {
object.setAttachNetworkInterface(com.amazon.ec2.AttachNetworkInterfaceType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponse.java b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponse.java
index b035240..12f0954 100644
--- a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponse.java
+++ b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class AttachNetworkInterfaceResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachNetworkInterfaceResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachNetworkInterfaceResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class AttachNetworkInterfaceResponse implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class AttachNetworkInterfaceResponse implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponseType.java b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponseType.java
index acebd7a..ead4599 100644
--- a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponseType.java
@@ -125,7 +125,8 @@ public class AttachNetworkInterfaceResponseType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class AttachNetworkInterfaceResponseType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceType.java b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceType.java
index a660a48..ba69236 100644
--- a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceType.java
+++ b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceType.java
@@ -149,7 +149,8 @@ public class AttachNetworkInterfaceType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -291,9 +292,8 @@ public class AttachNetworkInterfaceType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachVolume.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVolume.java b/awsapi/src/com/amazon/ec2/AttachVolume.java
index 63120fe..9e03b33 100644
--- a/awsapi/src/com/amazon/ec2/AttachVolume.java
+++ b/awsapi/src/com/amazon/ec2/AttachVolume.java
@@ -98,7 +98,8 @@ public class AttachVolume implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class AttachVolume implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java b/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java
index 4d76b85..b459466 100644
--- a/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java
+++ b/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java
@@ -98,7 +98,8 @@ public class AttachVolumeResponse implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class AttachVolumeResponse implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class AttachVolumeResponse implements org.apache.axis2.databinding.ADBBea
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachVolumeResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachVolumeResponse").equals(reader.getName())) {
object.setAttachVolumeResponse(com.amazon.ec2.AttachVolumeResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java b/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java
index 89e6b7d..fba5500 100644
--- a/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java
@@ -221,7 +221,8 @@ public class AttachVolumeResponseType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -462,9 +463,8 @@ public class AttachVolumeResponseType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachVolumeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVolumeType.java b/awsapi/src/com/amazon/ec2/AttachVolumeType.java
index bdc94c3..cb94df1 100644
--- a/awsapi/src/com/amazon/ec2/AttachVolumeType.java
+++ b/awsapi/src/com/amazon/ec2/AttachVolumeType.java
@@ -149,7 +149,8 @@ public class AttachVolumeType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -294,9 +295,8 @@ public class AttachVolumeType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachVpnGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVpnGateway.java b/awsapi/src/com/amazon/ec2/AttachVpnGateway.java
index 4e9192c..01c1d05 100644
--- a/awsapi/src/com/amazon/ec2/AttachVpnGateway.java
+++ b/awsapi/src/com/amazon/ec2/AttachVpnGateway.java
@@ -98,7 +98,8 @@ public class AttachVpnGateway implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class AttachVpnGateway implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class AttachVpnGateway implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachVpnGateway").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachVpnGateway").equals(reader.getName())) {
object.setAttachVpnGateway(com.amazon.ec2.AttachVpnGatewayType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java b/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java
index 3ad7911..8e098cb 100644
--- a/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java
@@ -98,7 +98,8 @@ public class AttachVpnGatewayResponse implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class AttachVpnGatewayResponse implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java b/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java
index 2a5cd66..337f7a4 100644
--- a/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java
@@ -125,7 +125,8 @@ public class AttachVpnGatewayResponseType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class AttachVpnGatewayResponseType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
[19/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/NullableAttributeValueType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NullableAttributeValueType.java b/awsapi/src/com/amazon/ec2/NullableAttributeValueType.java
index e1c8a5c..76dae7d 100644
--- a/awsapi/src/com/amazon/ec2/NullableAttributeValueType.java
+++ b/awsapi/src/com/amazon/ec2/NullableAttributeValueType.java
@@ -115,7 +115,8 @@ public class NullableAttributeValueType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -196,9 +197,8 @@ public class NullableAttributeValueType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/PlacementGroupInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PlacementGroupInfoType.java b/awsapi/src/com/amazon/ec2/PlacementGroupInfoType.java
index 12e2589..3886c9c 100644
--- a/awsapi/src/com/amazon/ec2/PlacementGroupInfoType.java
+++ b/awsapi/src/com/amazon/ec2/PlacementGroupInfoType.java
@@ -149,7 +149,8 @@ public class PlacementGroupInfoType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -294,9 +295,8 @@ public class PlacementGroupInfoType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/PlacementGroupSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PlacementGroupSetType.java b/awsapi/src/com/amazon/ec2/PlacementGroupSetType.java
index aa299dc..47cf29f 100644
--- a/awsapi/src/com/amazon/ec2/PlacementGroupSetType.java
+++ b/awsapi/src/com/amazon/ec2/PlacementGroupSetType.java
@@ -142,7 +142,8 @@ public class PlacementGroupSetType implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class PlacementGroupSetType implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/PlacementRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PlacementRequestType.java b/awsapi/src/com/amazon/ec2/PlacementRequestType.java
index 4b73328..e94f10b 100644
--- a/awsapi/src/com/amazon/ec2/PlacementRequestType.java
+++ b/awsapi/src/com/amazon/ec2/PlacementRequestType.java
@@ -191,7 +191,8 @@ public class PlacementRequestType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -338,9 +339,8 @@ public class PlacementRequestType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/PlacementResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PlacementResponseType.java b/awsapi/src/com/amazon/ec2/PlacementResponseType.java
index ad4cf00..4838eac 100644
--- a/awsapi/src/com/amazon/ec2/PlacementResponseType.java
+++ b/awsapi/src/com/amazon/ec2/PlacementResponseType.java
@@ -177,7 +177,8 @@ public class PlacementResponseType implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -323,9 +324,8 @@ public class PlacementResponseType implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/PortRangeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PortRangeType.java b/awsapi/src/com/amazon/ec2/PortRangeType.java
index 4c7c80c..8d674b7 100644
--- a/awsapi/src/com/amazon/ec2/PortRangeType.java
+++ b/awsapi/src/com/amazon/ec2/PortRangeType.java
@@ -125,7 +125,8 @@ public class PortRangeType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -232,9 +233,8 @@ public class PortRangeType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetItemType.java b/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetItemType.java
index 9b6e33f..9b6bd9a 100644
--- a/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetItemType.java
@@ -163,7 +163,8 @@ public class PriceScheduleRequestSetItemType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -302,9 +303,8 @@ public class PriceScheduleRequestSetItemType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetType.java b/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetType.java
index b52b8fc..50b26e6 100644
--- a/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetType.java
+++ b/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetType.java
@@ -129,7 +129,8 @@ public class PriceScheduleRequestSetType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -195,9 +196,8 @@ public class PriceScheduleRequestSetType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/PriceScheduleSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PriceScheduleSetItemType.java b/awsapi/src/com/amazon/ec2/PriceScheduleSetItemType.java
index 21d60ae..3e55b67 100644
--- a/awsapi/src/com/amazon/ec2/PriceScheduleSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/PriceScheduleSetItemType.java
@@ -187,7 +187,8 @@ public class PriceScheduleSetItemType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -355,9 +356,8 @@ public class PriceScheduleSetItemType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/PriceScheduleSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PriceScheduleSetType.java b/awsapi/src/com/amazon/ec2/PriceScheduleSetType.java
index 7abae96..dd39b75 100644
--- a/awsapi/src/com/amazon/ec2/PriceScheduleSetType.java
+++ b/awsapi/src/com/amazon/ec2/PriceScheduleSetType.java
@@ -142,7 +142,8 @@ public class PriceScheduleSetType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class PriceScheduleSetType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/PricingDetailsSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PricingDetailsSetItemType.java b/awsapi/src/com/amazon/ec2/PricingDetailsSetItemType.java
index 99096d2..26f38ef 100644
--- a/awsapi/src/com/amazon/ec2/PricingDetailsSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/PricingDetailsSetItemType.java
@@ -125,7 +125,8 @@ public class PricingDetailsSetItemType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -232,9 +233,8 @@ public class PricingDetailsSetItemType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/PricingDetailsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PricingDetailsSetType.java b/awsapi/src/com/amazon/ec2/PricingDetailsSetType.java
index 772bcb0..9a6f4da 100644
--- a/awsapi/src/com/amazon/ec2/PricingDetailsSetType.java
+++ b/awsapi/src/com/amazon/ec2/PricingDetailsSetType.java
@@ -142,7 +142,8 @@ public class PricingDetailsSetType implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class PricingDetailsSetType implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetItemRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetItemRequestType.java b/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetItemRequestType.java
index 18fbb6a..1cb1a01 100644
--- a/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetItemRequestType.java
+++ b/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetItemRequestType.java
@@ -140,7 +140,8 @@ public class PrivateIpAddressesSetItemRequestType implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -250,9 +251,8 @@ public class PrivateIpAddressesSetItemRequestType implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetRequestType.java b/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetRequestType.java
index bc5ca5b..b9089c0 100644
--- a/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetRequestType.java
+++ b/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetRequestType.java
@@ -142,7 +142,8 @@ public class PrivateIpAddressesSetRequestType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class PrivateIpAddressesSetRequestType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ProductCodeItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ProductCodeItemType.java b/awsapi/src/com/amazon/ec2/ProductCodeItemType.java
index 8c10931..1ade26a 100644
--- a/awsapi/src/com/amazon/ec2/ProductCodeItemType.java
+++ b/awsapi/src/com/amazon/ec2/ProductCodeItemType.java
@@ -101,7 +101,8 @@ public class ProductCodeItemType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class ProductCodeItemType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ProductCodeListType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ProductCodeListType.java b/awsapi/src/com/amazon/ec2/ProductCodeListType.java
index 114d1c5..4e73942 100644
--- a/awsapi/src/com/amazon/ec2/ProductCodeListType.java
+++ b/awsapi/src/com/amazon/ec2/ProductCodeListType.java
@@ -142,7 +142,8 @@ public class ProductCodeListType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class ProductCodeListType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,8 +463,8 @@ public class ProductCodeListType implements org.apache.axis2.databinding.ADBBean
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.ProductCodeItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.ProductCodeItemType.class,
- list1));
+ object.setItem((com.amazon.ec2.ProductCodeItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+ com.amazon.ec2.ProductCodeItemType.class, list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ProductCodesSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ProductCodesSetItemType.java b/awsapi/src/com/amazon/ec2/ProductCodesSetItemType.java
index e9d50b6..af861db 100644
--- a/awsapi/src/com/amazon/ec2/ProductCodesSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/ProductCodesSetItemType.java
@@ -125,7 +125,8 @@ public class ProductCodesSetItemType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class ProductCodesSetItemType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ProductCodesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ProductCodesSetType.java b/awsapi/src/com/amazon/ec2/ProductCodesSetType.java
index 56e5d6c..00a979c 100644
--- a/awsapi/src/com/amazon/ec2/ProductCodesSetType.java
+++ b/awsapi/src/com/amazon/ec2/ProductCodesSetType.java
@@ -142,7 +142,8 @@ public class ProductCodesSetType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class ProductCodesSetType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ProductDescriptionSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ProductDescriptionSetItemType.java b/awsapi/src/com/amazon/ec2/ProductDescriptionSetItemType.java
index bcafb13..8de6400 100644
--- a/awsapi/src/com/amazon/ec2/ProductDescriptionSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/ProductDescriptionSetItemType.java
@@ -101,7 +101,8 @@ public class ProductDescriptionSetItemType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class ProductDescriptionSetItemType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ProductDescriptionSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ProductDescriptionSetType.java b/awsapi/src/com/amazon/ec2/ProductDescriptionSetType.java
index f61b22a..4c9e5ea 100644
--- a/awsapi/src/com/amazon/ec2/ProductDescriptionSetType.java
+++ b/awsapi/src/com/amazon/ec2/ProductDescriptionSetType.java
@@ -129,7 +129,8 @@ public class ProductDescriptionSetType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -195,9 +196,8 @@ public class ProductDescriptionSetType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/PropagatingVgwSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PropagatingVgwSetType.java b/awsapi/src/com/amazon/ec2/PropagatingVgwSetType.java
index 2ee4136..0fe3e5e 100644
--- a/awsapi/src/com/amazon/ec2/PropagatingVgwSetType.java
+++ b/awsapi/src/com/amazon/ec2/PropagatingVgwSetType.java
@@ -142,7 +142,8 @@ public class PropagatingVgwSetType implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class PropagatingVgwSetType implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,8 +463,8 @@ public class PropagatingVgwSetType implements org.apache.axis2.databinding.ADBBe
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.PropagatingVgwType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.PropagatingVgwType.class,
- list1));
+ object.setItem((com.amazon.ec2.PropagatingVgwType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+ com.amazon.ec2.PropagatingVgwType.class, list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/PropagatingVgwType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PropagatingVgwType.java b/awsapi/src/com/amazon/ec2/PropagatingVgwType.java
index 598034c..60246b3 100644
--- a/awsapi/src/com/amazon/ec2/PropagatingVgwType.java
+++ b/awsapi/src/com/amazon/ec2/PropagatingVgwType.java
@@ -101,7 +101,8 @@ public class PropagatingVgwType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class PropagatingVgwType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOffering.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOffering.java b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOffering.java
index 006b6ef..03fddd8 100644
--- a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOffering.java
+++ b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOffering.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class PurchaseReservedInstancesOffering implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "PurchaseReservedInstancesOffering", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "PurchaseReservedInstancesOffering", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class PurchaseReservedInstancesOffering implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class PurchaseReservedInstancesOffering implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponse.java b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponse.java
index 49c0850..930ea83 100644
--- a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponse.java
+++ b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponse.java
@@ -30,8 +30,8 @@ package com.amazon.ec2;
public class PurchaseReservedInstancesOfferingResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "PurchaseReservedInstancesOfferingResponse",
- "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "PurchaseReservedInstancesOfferingResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -99,7 +99,8 @@ public class PurchaseReservedInstancesOfferingResponse implements org.apache.axi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -119,9 +120,8 @@ public class PurchaseReservedInstancesOfferingResponse implements org.apache.axi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponseType.java b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponseType.java
index 68db5b7..86f7ce7 100644
--- a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponseType.java
+++ b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponseType.java
@@ -125,7 +125,8 @@ public class PurchaseReservedInstancesOfferingResponseType implements org.apache
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class PurchaseReservedInstancesOfferingResponseType implements org.apache
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingType.java b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingType.java
index 9d8efa9..92dc498 100644
--- a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingType.java
+++ b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingType.java
@@ -163,7 +163,8 @@ public class PurchaseReservedInstancesOfferingType implements org.apache.axis2.d
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -278,9 +279,8 @@ public class PurchaseReservedInstancesOfferingType implements org.apache.axis2.d
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -499,7 +499,8 @@ public class PurchaseReservedInstancesOfferingType implements org.apache.axis2.d
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingId").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingId").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RebootInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RebootInstances.java b/awsapi/src/com/amazon/ec2/RebootInstances.java
index 1739606..212f2e4 100644
--- a/awsapi/src/com/amazon/ec2/RebootInstances.java
+++ b/awsapi/src/com/amazon/ec2/RebootInstances.java
@@ -98,7 +98,8 @@ public class RebootInstances implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class RebootInstances implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class RebootInstances implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RebootInstances").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RebootInstances").equals(reader.getName())) {
object.setRebootInstances(com.amazon.ec2.RebootInstancesType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RebootInstancesInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RebootInstancesInfoType.java b/awsapi/src/com/amazon/ec2/RebootInstancesInfoType.java
index b212ce0..179dad2 100644
--- a/awsapi/src/com/amazon/ec2/RebootInstancesInfoType.java
+++ b/awsapi/src/com/amazon/ec2/RebootInstancesInfoType.java
@@ -129,7 +129,8 @@ public class RebootInstancesInfoType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -195,9 +196,8 @@ public class RebootInstancesInfoType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RebootInstancesItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RebootInstancesItemType.java b/awsapi/src/com/amazon/ec2/RebootInstancesItemType.java
index 672f507..2e03b79 100644
--- a/awsapi/src/com/amazon/ec2/RebootInstancesItemType.java
+++ b/awsapi/src/com/amazon/ec2/RebootInstancesItemType.java
@@ -101,7 +101,8 @@ public class RebootInstancesItemType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class RebootInstancesItemType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RebootInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RebootInstancesResponse.java b/awsapi/src/com/amazon/ec2/RebootInstancesResponse.java
index 0a6e784..cb785c2 100644
--- a/awsapi/src/com/amazon/ec2/RebootInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/RebootInstancesResponse.java
@@ -98,7 +98,8 @@ public class RebootInstancesResponse implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class RebootInstancesResponse implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RebootInstancesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RebootInstancesResponseType.java b/awsapi/src/com/amazon/ec2/RebootInstancesResponseType.java
index 138f1a7..91d7dd1 100644
--- a/awsapi/src/com/amazon/ec2/RebootInstancesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/RebootInstancesResponseType.java
@@ -125,7 +125,8 @@ public class RebootInstancesResponseType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class RebootInstancesResponseType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RebootInstancesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RebootInstancesType.java b/awsapi/src/com/amazon/ec2/RebootInstancesType.java
index 83ecc0e..3fffc33 100644
--- a/awsapi/src/com/amazon/ec2/RebootInstancesType.java
+++ b/awsapi/src/com/amazon/ec2/RebootInstancesType.java
@@ -101,7 +101,8 @@ public class RebootInstancesType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -155,9 +156,8 @@ public class RebootInstancesType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RecurringChargesSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RecurringChargesSetItemType.java b/awsapi/src/com/amazon/ec2/RecurringChargesSetItemType.java
index f0a9172..ddf2352 100644
--- a/awsapi/src/com/amazon/ec2/RecurringChargesSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/RecurringChargesSetItemType.java
@@ -125,7 +125,8 @@ public class RecurringChargesSetItemType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class RecurringChargesSetItemType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RecurringChargesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RecurringChargesSetType.java b/awsapi/src/com/amazon/ec2/RecurringChargesSetType.java
index 1b94767..d362547 100644
--- a/awsapi/src/com/amazon/ec2/RecurringChargesSetType.java
+++ b/awsapi/src/com/amazon/ec2/RecurringChargesSetType.java
@@ -142,7 +142,8 @@ public class RecurringChargesSetType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class RecurringChargesSetType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RegionItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RegionItemType.java b/awsapi/src/com/amazon/ec2/RegionItemType.java
index bcd6ace..dad953d 100644
--- a/awsapi/src/com/amazon/ec2/RegionItemType.java
+++ b/awsapi/src/com/amazon/ec2/RegionItemType.java
@@ -125,7 +125,8 @@ public class RegionItemType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class RegionItemType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RegionSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RegionSetType.java b/awsapi/src/com/amazon/ec2/RegionSetType.java
index d6a8e5e..d6e383b 100644
--- a/awsapi/src/com/amazon/ec2/RegionSetType.java
+++ b/awsapi/src/com/amazon/ec2/RegionSetType.java
@@ -142,7 +142,8 @@ public class RegionSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class RegionSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,7 +463,8 @@ public class RegionSetType implements org.apache.axis2.databinding.ADBBean {
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.RegionItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.RegionItemType.class, list1));
+ object.setItem((com.amazon.ec2.RegionItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.RegionItemType.class,
+ list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RegisterImage.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RegisterImage.java b/awsapi/src/com/amazon/ec2/RegisterImage.java
index 0146be1..9e4438a 100644
--- a/awsapi/src/com/amazon/ec2/RegisterImage.java
+++ b/awsapi/src/com/amazon/ec2/RegisterImage.java
@@ -98,7 +98,8 @@ public class RegisterImage implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class RegisterImage implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class RegisterImage implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RegisterImage").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RegisterImage").equals(reader.getName())) {
object.setRegisterImage(com.amazon.ec2.RegisterImageType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RegisterImageResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RegisterImageResponse.java b/awsapi/src/com/amazon/ec2/RegisterImageResponse.java
index 7ec9966..4028c3d 100644
--- a/awsapi/src/com/amazon/ec2/RegisterImageResponse.java
+++ b/awsapi/src/com/amazon/ec2/RegisterImageResponse.java
@@ -98,7 +98,8 @@ public class RegisterImageResponse implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class RegisterImageResponse implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class RegisterImageResponse implements org.apache.axis2.databinding.ADBBe
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RegisterImageResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RegisterImageResponse").equals(reader.getName())) {
object.setRegisterImageResponse(com.amazon.ec2.RegisterImageResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RegisterImageResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RegisterImageResponseType.java b/awsapi/src/com/amazon/ec2/RegisterImageResponseType.java
index 6771765..6a592f0 100644
--- a/awsapi/src/com/amazon/ec2/RegisterImageResponseType.java
+++ b/awsapi/src/com/amazon/ec2/RegisterImageResponseType.java
@@ -125,7 +125,8 @@ public class RegisterImageResponseType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class RegisterImageResponseType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RegisterImageType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RegisterImageType.java b/awsapi/src/com/amazon/ec2/RegisterImageType.java
index a9145b4..c60ba57 100644
--- a/awsapi/src/com/amazon/ec2/RegisterImageType.java
+++ b/awsapi/src/com/amazon/ec2/RegisterImageType.java
@@ -367,7 +367,8 @@ public class RegisterImageType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -650,9 +651,8 @@ public class RegisterImageType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReleaseAddress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReleaseAddress.java b/awsapi/src/com/amazon/ec2/ReleaseAddress.java
index cf70019..395cbf4 100644
--- a/awsapi/src/com/amazon/ec2/ReleaseAddress.java
+++ b/awsapi/src/com/amazon/ec2/ReleaseAddress.java
@@ -98,7 +98,8 @@ public class ReleaseAddress implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ReleaseAddress implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class ReleaseAddress implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReleaseAddress").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReleaseAddress").equals(reader.getName())) {
object.setReleaseAddress(com.amazon.ec2.ReleaseAddressType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReleaseAddressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReleaseAddressResponse.java b/awsapi/src/com/amazon/ec2/ReleaseAddressResponse.java
index 2418e39..5c3eccf 100644
--- a/awsapi/src/com/amazon/ec2/ReleaseAddressResponse.java
+++ b/awsapi/src/com/amazon/ec2/ReleaseAddressResponse.java
@@ -98,7 +98,8 @@ public class ReleaseAddressResponse implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ReleaseAddressResponse implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class ReleaseAddressResponse implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReleaseAddressResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReleaseAddressResponse").equals(reader.getName())) {
object.setReleaseAddressResponse(com.amazon.ec2.ReleaseAddressResponseType.Factory.parse(reader));
[20/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttribute.java b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttribute.java
index 3c0f6d9..76e7e2e 100644
--- a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttribute.java
+++ b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttribute.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class ModifyNetworkInterfaceAttribute implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyNetworkInterfaceAttribute", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyNetworkInterfaceAttribute",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class ModifyNetworkInterfaceAttribute implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class ModifyNetworkInterfaceAttribute implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponse.java b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponse.java
index 0967ba8..e7cb112 100644
--- a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponse.java
@@ -30,8 +30,8 @@ package com.amazon.ec2;
public class ModifyNetworkInterfaceAttributeResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyNetworkInterfaceAttributeResponse",
- "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "ModifyNetworkInterfaceAttributeResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -99,7 +99,8 @@ public class ModifyNetworkInterfaceAttributeResponse implements org.apache.axis2
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -119,9 +120,8 @@ public class ModifyNetworkInterfaceAttributeResponse implements org.apache.axis2
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponseType.java
index 8748654..65af5bf 100644
--- a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponseType.java
@@ -125,7 +125,8 @@ public class ModifyNetworkInterfaceAttributeResponseType implements org.apache.a
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class ModifyNetworkInterfaceAttributeResponseType implements org.apache.a
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeType.java b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeType.java
index 05f3b0f..0057f6b 100644
--- a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeType.java
@@ -125,7 +125,8 @@ public class ModifyNetworkInterfaceAttributeType implements org.apache.axis2.dat
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class ModifyNetworkInterfaceAttributeType implements org.apache.axis2.dat
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeTypeChoice_type0.java
index 4c60d65..2f8e91a 100644
--- a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeTypeChoice_type0.java
@@ -252,7 +252,8 @@ public class ModifyNetworkInterfaceAttributeTypeChoice_type0 implements org.apac
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -267,7 +268,8 @@ public class ModifyNetworkInterfaceAttributeTypeChoice_type0 implements org.apac
java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/");
if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) {
- writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":ModifyNetworkInterfaceAttributeTypeChoice_type0", xmlWriter);
+ writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":ModifyNetworkInterfaceAttributeTypeChoice_type0",
+ xmlWriter);
} else {
writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "ModifyNetworkInterfaceAttributeTypeChoice_type0", xmlWriter);
}
@@ -303,9 +305,8 @@ public class ModifyNetworkInterfaceAttributeTypeChoice_type0 implements org.apac
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifySnapshotAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifySnapshotAttribute.java b/awsapi/src/com/amazon/ec2/ModifySnapshotAttribute.java
index c592f81..9d1eb3b 100644
--- a/awsapi/src/com/amazon/ec2/ModifySnapshotAttribute.java
+++ b/awsapi/src/com/amazon/ec2/ModifySnapshotAttribute.java
@@ -98,7 +98,8 @@ public class ModifySnapshotAttribute implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ModifySnapshotAttribute implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponse.java b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponse.java
index 962953e..cd29214 100644
--- a/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class ModifySnapshotAttributeResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifySnapshotAttributeResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifySnapshotAttributeResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class ModifySnapshotAttributeResponse implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class ModifySnapshotAttributeResponse implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponseType.java
index 07beae9..2df2d54 100644
--- a/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponseType.java
@@ -125,7 +125,8 @@ public class ModifySnapshotAttributeResponseType implements org.apache.axis2.dat
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class ModifySnapshotAttributeResponseType implements org.apache.axis2.dat
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeType.java b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeType.java
index 7719fad..64674c8 100644
--- a/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeType.java
@@ -125,7 +125,8 @@ public class ModifySnapshotAttributeType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class ModifySnapshotAttributeType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -445,7 +445,8 @@ public class ModifySnapshotAttributeType implements org.apache.axis2.databinding
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) {
object.setCreateVolumePermission(com.amazon.ec2.CreateVolumePermissionOperationType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyVolumeAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyVolumeAttribute.java b/awsapi/src/com/amazon/ec2/ModifyVolumeAttribute.java
index 4fb43ce..5e3f225 100644
--- a/awsapi/src/com/amazon/ec2/ModifyVolumeAttribute.java
+++ b/awsapi/src/com/amazon/ec2/ModifyVolumeAttribute.java
@@ -98,7 +98,8 @@ public class ModifyVolumeAttribute implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ModifyVolumeAttribute implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class ModifyVolumeAttribute implements org.apache.axis2.databinding.ADBBe
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyVolumeAttribute").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyVolumeAttribute").equals(reader.getName())) {
object.setModifyVolumeAttribute(com.amazon.ec2.ModifyVolumeAttributeType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponse.java b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponse.java
index 4933047..c5b7ae7 100644
--- a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class ModifyVolumeAttributeResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyVolumeAttributeResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyVolumeAttributeResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class ModifyVolumeAttributeResponse implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class ModifyVolumeAttributeResponse implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponseType.java
index ddac078..a190894 100644
--- a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponseType.java
@@ -125,7 +125,8 @@ public class ModifyVolumeAttributeResponseType implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class ModifyVolumeAttributeResponseType implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeType.java b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeType.java
index 5b8076e..8fac1a6 100644
--- a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeType.java
@@ -125,7 +125,8 @@ public class ModifyVolumeAttributeType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class ModifyVolumeAttributeType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeTypeChoice_type0.java
index 6060c9a..e37999a 100644
--- a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeTypeChoice_type0.java
@@ -126,7 +126,8 @@ public class ModifyVolumeAttributeTypeChoice_type0 implements org.apache.axis2.d
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -159,9 +160,8 @@ public class ModifyVolumeAttributeTypeChoice_type0 implements org.apache.axis2.d
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/MonitorInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/MonitorInstances.java b/awsapi/src/com/amazon/ec2/MonitorInstances.java
index 0b4d461..722d39f 100644
--- a/awsapi/src/com/amazon/ec2/MonitorInstances.java
+++ b/awsapi/src/com/amazon/ec2/MonitorInstances.java
@@ -98,7 +98,8 @@ public class MonitorInstances implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class MonitorInstances implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class MonitorInstances implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "MonitorInstances").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "MonitorInstances").equals(reader.getName())) {
object.setMonitorInstances(com.amazon.ec2.MonitorInstancesType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/MonitorInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesResponse.java b/awsapi/src/com/amazon/ec2/MonitorInstancesResponse.java
index 82d81cd..4bf298c 100644
--- a/awsapi/src/com/amazon/ec2/MonitorInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/MonitorInstancesResponse.java
@@ -98,7 +98,8 @@ public class MonitorInstancesResponse implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class MonitorInstancesResponse implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetItemType.java b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetItemType.java
index 44e52cb..4913542 100644
--- a/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetItemType.java
@@ -125,7 +125,8 @@ public class MonitorInstancesResponseSetItemType implements org.apache.axis2.dat
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class MonitorInstancesResponseSetItemType implements org.apache.axis2.dat
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetType.java b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetType.java
index 3bc01ad..83335b9 100644
--- a/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetType.java
+++ b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetType.java
@@ -129,7 +129,8 @@ public class MonitorInstancesResponseSetType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -195,9 +196,8 @@ public class MonitorInstancesResponseSetType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesResponseType.java b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseType.java
index 5aef8bc..ac13a82 100644
--- a/awsapi/src/com/amazon/ec2/MonitorInstancesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseType.java
@@ -125,7 +125,8 @@ public class MonitorInstancesResponseType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class MonitorInstancesResponseType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/MonitorInstancesSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesSetItemType.java b/awsapi/src/com/amazon/ec2/MonitorInstancesSetItemType.java
index 5e27342..af3bf35 100644
--- a/awsapi/src/com/amazon/ec2/MonitorInstancesSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/MonitorInstancesSetItemType.java
@@ -101,7 +101,8 @@ public class MonitorInstancesSetItemType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class MonitorInstancesSetItemType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/MonitorInstancesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesSetType.java b/awsapi/src/com/amazon/ec2/MonitorInstancesSetType.java
index 6dee688..048e644 100644
--- a/awsapi/src/com/amazon/ec2/MonitorInstancesSetType.java
+++ b/awsapi/src/com/amazon/ec2/MonitorInstancesSetType.java
@@ -129,7 +129,8 @@ public class MonitorInstancesSetType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -195,9 +196,8 @@ public class MonitorInstancesSetType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/MonitorInstancesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesType.java b/awsapi/src/com/amazon/ec2/MonitorInstancesType.java
index 1cd78d2..0de9557 100644
--- a/awsapi/src/com/amazon/ec2/MonitorInstancesType.java
+++ b/awsapi/src/com/amazon/ec2/MonitorInstancesType.java
@@ -101,7 +101,8 @@ public class MonitorInstancesType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -155,9 +156,8 @@ public class MonitorInstancesType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/MonitoringInstanceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/MonitoringInstanceType.java b/awsapi/src/com/amazon/ec2/MonitoringInstanceType.java
index 146bd16..65416e1 100644
--- a/awsapi/src/com/amazon/ec2/MonitoringInstanceType.java
+++ b/awsapi/src/com/amazon/ec2/MonitoringInstanceType.java
@@ -116,7 +116,8 @@ public class MonitoringInstanceType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -194,9 +195,8 @@ public class MonitoringInstanceType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/NetworkAclAssociationSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkAclAssociationSetType.java b/awsapi/src/com/amazon/ec2/NetworkAclAssociationSetType.java
index af47688..fd70c1e 100644
--- a/awsapi/src/com/amazon/ec2/NetworkAclAssociationSetType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkAclAssociationSetType.java
@@ -142,7 +142,8 @@ public class NetworkAclAssociationSetType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class NetworkAclAssociationSetType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/NetworkAclAssociationType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkAclAssociationType.java b/awsapi/src/com/amazon/ec2/NetworkAclAssociationType.java
index 08510c0..05b36b7 100644
--- a/awsapi/src/com/amazon/ec2/NetworkAclAssociationType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkAclAssociationType.java
@@ -149,7 +149,8 @@ public class NetworkAclAssociationType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -294,9 +295,8 @@ public class NetworkAclAssociationType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -519,7 +519,8 @@ public class NetworkAclAssociationType implements org.apache.axis2.databinding.A
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkAclAssociationId").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkAclAssociationId").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/NetworkAclEntrySetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkAclEntrySetType.java b/awsapi/src/com/amazon/ec2/NetworkAclEntrySetType.java
index 4b542f6..da1e80e 100644
--- a/awsapi/src/com/amazon/ec2/NetworkAclEntrySetType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkAclEntrySetType.java
@@ -142,7 +142,8 @@ public class NetworkAclEntrySetType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class NetworkAclEntrySetType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,8 +463,8 @@ public class NetworkAclEntrySetType implements org.apache.axis2.databinding.ADBB
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.NetworkAclEntryType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.NetworkAclEntryType.class,
- list1));
+ object.setItem((com.amazon.ec2.NetworkAclEntryType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+ com.amazon.ec2.NetworkAclEntryType.class, list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/NetworkAclEntryType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkAclEntryType.java b/awsapi/src/com/amazon/ec2/NetworkAclEntryType.java
index e8ab453..70791ba 100644
--- a/awsapi/src/com/amazon/ec2/NetworkAclEntryType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkAclEntryType.java
@@ -273,7 +273,8 @@ public class NetworkAclEntryType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -487,9 +488,8 @@ public class NetworkAclEntryType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/NetworkAclIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkAclIdSetItemType.java b/awsapi/src/com/amazon/ec2/NetworkAclIdSetItemType.java
index 073868e..d3bcbeb 100644
--- a/awsapi/src/com/amazon/ec2/NetworkAclIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkAclIdSetItemType.java
@@ -101,7 +101,8 @@ public class NetworkAclIdSetItemType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class NetworkAclIdSetItemType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/NetworkAclIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkAclIdSetType.java b/awsapi/src/com/amazon/ec2/NetworkAclIdSetType.java
index 8f0da0a..01259ed 100644
--- a/awsapi/src/com/amazon/ec2/NetworkAclIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkAclIdSetType.java
@@ -142,7 +142,8 @@ public class NetworkAclIdSetType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class NetworkAclIdSetType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/NetworkAclSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkAclSetType.java b/awsapi/src/com/amazon/ec2/NetworkAclSetType.java
index 0a1290a..279170e 100644
--- a/awsapi/src/com/amazon/ec2/NetworkAclSetType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkAclSetType.java
@@ -142,7 +142,8 @@ public class NetworkAclSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class NetworkAclSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,7 +463,8 @@ public class NetworkAclSetType implements org.apache.axis2.databinding.ADBBean {
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.NetworkAclType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.NetworkAclType.class, list1));
+ object.setItem((com.amazon.ec2.NetworkAclType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.NetworkAclType.class,
+ list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/NetworkAclType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkAclType.java b/awsapi/src/com/amazon/ec2/NetworkAclType.java
index c1be8bb..c285334 100644
--- a/awsapi/src/com/amazon/ec2/NetworkAclType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkAclType.java
@@ -235,7 +235,8 @@ public class NetworkAclType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -392,9 +393,8 @@ public class NetworkAclType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/NetworkInterfaceAssociationType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfaceAssociationType.java b/awsapi/src/com/amazon/ec2/NetworkInterfaceAssociationType.java
index 911aa79..4dd2c63 100644
--- a/awsapi/src/com/amazon/ec2/NetworkInterfaceAssociationType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkInterfaceAssociationType.java
@@ -215,7 +215,8 @@ public class NetworkInterfaceAssociationType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -394,9 +395,8 @@ public class NetworkInterfaceAssociationType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/NetworkInterfaceAttachmentType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfaceAttachmentType.java b/awsapi/src/com/amazon/ec2/NetworkInterfaceAttachmentType.java
index aec203a..1387ce8 100644
--- a/awsapi/src/com/amazon/ec2/NetworkInterfaceAttachmentType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkInterfaceAttachmentType.java
@@ -273,7 +273,8 @@ public class NetworkInterfaceAttachmentType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -541,9 +542,8 @@ public class NetworkInterfaceAttachmentType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetItemType.java b/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetItemType.java
index 76b0fb6..c07dd5b 100644
--- a/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetItemType.java
@@ -101,7 +101,8 @@ public class NetworkInterfaceIdSetItemType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class NetworkInterfaceIdSetItemType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetType.java b/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetType.java
index a9e2512..554cb7c 100644
--- a/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetType.java
@@ -142,7 +142,8 @@ public class NetworkInterfaceIdSetType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class NetworkInterfaceIdSetType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetItemType.java b/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetItemType.java
index 51c6868..2c08bcd 100644
--- a/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetItemType.java
@@ -163,7 +163,8 @@ public class NetworkInterfacePrivateIpAddressesSetItemType implements org.apache
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -278,9 +279,8 @@ public class NetworkInterfacePrivateIpAddressesSetItemType implements org.apache
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetType.java b/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetType.java
index 32b2f45..b539a56 100644
--- a/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetType.java
@@ -103,7 +103,8 @@ public class NetworkInterfacePrivateIpAddressesSetType implements org.apache.axi
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem);
list.add(param);
- this.localItem = (com.amazon.ec2.NetworkInterfacePrivateIpAddressesSetItemType[])list.toArray(new com.amazon.ec2.NetworkInterfacePrivateIpAddressesSetItemType[list.size()]);
+ this.localItem =
+ (com.amazon.ec2.NetworkInterfacePrivateIpAddressesSetItemType[])list.toArray(new com.amazon.ec2.NetworkInterfacePrivateIpAddressesSetItemType[list.size()]);
}
@@ -142,7 +143,8 @@ public class NetworkInterfacePrivateIpAddressesSetType implements org.apache.axi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +210,8 @@ public class NetworkInterfacePrivateIpAddressesSetType implements org.apache.axi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/NetworkInterfaceSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfaceSetType.java b/awsapi/src/com/amazon/ec2/NetworkInterfaceSetType.java
index 3f99200..c580476 100644
--- a/awsapi/src/com/amazon/ec2/NetworkInterfaceSetType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkInterfaceSetType.java
@@ -142,7 +142,8 @@ public class NetworkInterfaceSetType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class NetworkInterfaceSetType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/NetworkInterfaceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfaceType.java b/awsapi/src/com/amazon/ec2/NetworkInterfaceType.java
index bd80c98..d922f2a 100644
--- a/awsapi/src/com/amazon/ec2/NetworkInterfaceType.java
+++ b/awsapi/src/com/amazon/ec2/NetworkInterfaceType.java
@@ -664,7 +664,8 @@ public class NetworkInterfaceType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -1155,9 +1156,8 @@ public class NetworkInterfaceType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -1783,7 +1783,8 @@ public class NetworkInterfaceType implements org.apache.axis2.databinding.ADBBea
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) {
object.setPrivateIpAddressesSet(com.amazon.ec2.NetworkInterfacePrivateIpAddressesSetType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/NullableAttributeBooleanValueType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/NullableAttributeBooleanValueType.java b/awsapi/src/com/amazon/ec2/NullableAttributeBooleanValueType.java
index 5ced7e0..c751a80 100644
--- a/awsapi/src/com/amazon/ec2/NullableAttributeBooleanValueType.java
+++ b/awsapi/src/com/amazon/ec2/NullableAttributeBooleanValueType.java
@@ -116,7 +116,8 @@ public class NullableAttributeBooleanValueType implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -194,9 +195,8 @@ public class NullableAttributeBooleanValueType implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
[36/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java b/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java
index 48a5aec..a96e5da 100644
--- a/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java
@@ -125,7 +125,8 @@ public class AttachVpnGatewayType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class AttachVpnGatewayType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java b/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java
index e85f25a..d675c96 100644
--- a/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java
@@ -221,7 +221,8 @@ public class AttachmentSetItemResponseType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -459,9 +460,8 @@ public class AttachmentSetItemResponseType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java b/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java
index 502f112..ffa7934 100644
--- a/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java
@@ -142,7 +142,8 @@ public class AttachmentSetResponseType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class AttachmentSetResponseType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachmentSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachmentSetType.java b/awsapi/src/com/amazon/ec2/AttachmentSetType.java
index 3cd2ee5..91cb959 100644
--- a/awsapi/src/com/amazon/ec2/AttachmentSetType.java
+++ b/awsapi/src/com/amazon/ec2/AttachmentSetType.java
@@ -142,7 +142,8 @@ public class AttachmentSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class AttachmentSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,7 +463,8 @@ public class AttachmentSetType implements org.apache.axis2.databinding.ADBBean {
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.AttachmentType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.AttachmentType.class, list1));
+ object.setItem((com.amazon.ec2.AttachmentType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.AttachmentType.class,
+ list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttachmentType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttachmentType.java b/awsapi/src/com/amazon/ec2/AttachmentType.java
index 5d7680d..77d4a75 100644
--- a/awsapi/src/com/amazon/ec2/AttachmentType.java
+++ b/awsapi/src/com/amazon/ec2/AttachmentType.java
@@ -125,7 +125,8 @@ public class AttachmentType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class AttachmentType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java b/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java
index f3dd020..763f0f9 100644
--- a/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java
+++ b/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java
@@ -101,7 +101,8 @@ public class AttributeBooleanValueType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -179,9 +180,8 @@ public class AttributeBooleanValueType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AttributeValueType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AttributeValueType.java b/awsapi/src/com/amazon/ec2/AttributeValueType.java
index bb4dc16..c306b59 100644
--- a/awsapi/src/com/amazon/ec2/AttributeValueType.java
+++ b/awsapi/src/com/amazon/ec2/AttributeValueType.java
@@ -101,7 +101,8 @@ public class AttributeValueType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class AttributeValueType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgress.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgress.java
index ef3f469..235eefc 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgress.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgress.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class AuthorizeSecurityGroupEgress implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AuthorizeSecurityGroupEgress", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AuthorizeSecurityGroupEgress",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class AuthorizeSecurityGroupEgress implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class AuthorizeSecurityGroupEgress implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponse.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponse.java
index 5d383a5..869aaf5 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponse.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponse.java
@@ -30,8 +30,8 @@ package com.amazon.ec2;
public class AuthorizeSecurityGroupEgressResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AuthorizeSecurityGroupEgressResponse",
- "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "AuthorizeSecurityGroupEgressResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -99,7 +99,8 @@ public class AuthorizeSecurityGroupEgressResponse implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -119,9 +120,8 @@ public class AuthorizeSecurityGroupEgressResponse implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponseType.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponseType.java
index ade4ab9..fcb7435 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponseType.java
@@ -125,7 +125,8 @@ public class AuthorizeSecurityGroupEgressResponseType implements org.apache.axis
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class AuthorizeSecurityGroupEgressResponseType implements org.apache.axis
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressType.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressType.java
index 0ade5c0..2a2cdfd 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressType.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressType.java
@@ -125,7 +125,8 @@ public class AuthorizeSecurityGroupEgressType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class AuthorizeSecurityGroupEgressType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java
index 6da388a..e84d54f 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class AuthorizeSecurityGroupIngress implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AuthorizeSecurityGroupIngress", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AuthorizeSecurityGroupIngress",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class AuthorizeSecurityGroupIngress implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class AuthorizeSecurityGroupIngress implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java
index 200e28d..42041c3 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java
@@ -30,8 +30,8 @@ package com.amazon.ec2;
public class AuthorizeSecurityGroupIngressResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AuthorizeSecurityGroupIngressResponse",
- "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "AuthorizeSecurityGroupIngressResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -99,7 +99,8 @@ public class AuthorizeSecurityGroupIngressResponse implements org.apache.axis2.d
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -119,9 +120,8 @@ public class AuthorizeSecurityGroupIngressResponse implements org.apache.axis2.d
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java
index bb77e71..f94d429 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java
@@ -125,7 +125,8 @@ public class AuthorizeSecurityGroupIngressResponseType implements org.apache.axi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class AuthorizeSecurityGroupIngressResponseType implements org.apache.axi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java
index a53ff3f..ef3e801 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java
@@ -163,7 +163,8 @@ public class AuthorizeSecurityGroupIngressType implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -254,9 +255,8 @@ public class AuthorizeSecurityGroupIngressType implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressTypeChoice_type0.java
index fd71699..be1703e 100644
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressTypeChoice_type0.java
@@ -168,7 +168,8 @@ public class AuthorizeSecurityGroupIngressTypeChoice_type0 implements org.apache
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -261,9 +262,8 @@ public class AuthorizeSecurityGroupIngressTypeChoice_type0 implements org.apache
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java b/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java
index 1d0430b..9275d1a 100644
--- a/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java
+++ b/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java
@@ -173,7 +173,8 @@ public class AvailabilityZoneItemType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -323,9 +324,8 @@ public class AvailabilityZoneItemType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java b/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java
index 9bee81f..78c72ca 100644
--- a/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java
+++ b/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java
@@ -142,7 +142,8 @@ public class AvailabilityZoneMessageSetType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class AvailabilityZoneMessageSetType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java b/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java
index eb920a3..a228275 100644
--- a/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java
+++ b/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java
@@ -101,7 +101,8 @@ public class AvailabilityZoneMessageType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class AvailabilityZoneMessageType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java b/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java
index bc271cf..fa0ba5f 100644
--- a/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java
+++ b/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java
@@ -142,7 +142,8 @@ public class AvailabilityZoneSetType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class AvailabilityZoneSetType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java b/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java
index b0d6cbe..e9f6109 100644
--- a/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java
+++ b/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java
@@ -125,7 +125,8 @@ public class BlockDeviceMappingItemType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class BlockDeviceMappingItemType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java
index 4aa651b..0363031 100644
--- a/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java
@@ -210,7 +210,8 @@ public class BlockDeviceMappingItemTypeChoice_type0 implements org.apache.axis2.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -282,9 +283,8 @@ public class BlockDeviceMappingItemTypeChoice_type0 implements org.apache.axis2.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java b/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java
index 753f782..72b095d 100644
--- a/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java
+++ b/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java
@@ -142,7 +142,8 @@ public class BlockDeviceMappingType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class BlockDeviceMappingType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/BundleInstance.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstance.java b/awsapi/src/com/amazon/ec2/BundleInstance.java
index 8631869..e5faa4e 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstance.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstance.java
@@ -98,7 +98,8 @@ public class BundleInstance implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class BundleInstance implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class BundleInstance implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "BundleInstance").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "BundleInstance").equals(reader.getName())) {
object.setBundleInstance(com.amazon.ec2.BundleInstanceType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java b/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java
index 064f9d8..002136a 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java
@@ -98,7 +98,8 @@ public class BundleInstanceResponse implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class BundleInstanceResponse implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class BundleInstanceResponse implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "BundleInstanceResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "BundleInstanceResponse").equals(reader.getName())) {
object.setBundleInstanceResponse(com.amazon.ec2.BundleInstanceResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java b/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java
index 0b44461..f44de80 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java
@@ -125,7 +125,8 @@ public class BundleInstanceResponseType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class BundleInstanceResponseType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java b/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java
index 1434662..807dff5 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java
@@ -239,7 +239,8 @@ public class BundleInstanceS3StorageType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -450,9 +451,8 @@ public class BundleInstanceS3StorageType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -764,7 +764,8 @@ public class BundleInstanceS3StorageType implements org.apache.axis2.databinding
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "uploadPolicySignature").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "uploadPolicySignature").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java b/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java
index f75a1e9..b73bbc2 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java
@@ -125,7 +125,8 @@ public class BundleInstanceTaskErrorType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class BundleInstanceTaskErrorType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java b/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java
index 524009a..38d1f86 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java
@@ -101,7 +101,8 @@ public class BundleInstanceTaskStorageType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -155,9 +156,8 @@ public class BundleInstanceTaskStorageType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java b/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java
index 0227d92..e717186 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java
@@ -297,7 +297,8 @@ public class BundleInstanceTaskType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -549,9 +550,8 @@ public class BundleInstanceTaskType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java b/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java
index 9a0a118..c5bb82b 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java
@@ -142,7 +142,8 @@ public class BundleInstanceTasksSetType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class BundleInstanceTasksSetType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/BundleInstanceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceType.java b/awsapi/src/com/amazon/ec2/BundleInstanceType.java
index 514c0e0..315c425 100644
--- a/awsapi/src/com/amazon/ec2/BundleInstanceType.java
+++ b/awsapi/src/com/amazon/ec2/BundleInstanceType.java
@@ -125,7 +125,8 @@ public class BundleInstanceType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class BundleInstanceType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelBundleTask.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelBundleTask.java b/awsapi/src/com/amazon/ec2/CancelBundleTask.java
index 0cb2a2c..81ce775 100644
--- a/awsapi/src/com/amazon/ec2/CancelBundleTask.java
+++ b/awsapi/src/com/amazon/ec2/CancelBundleTask.java
@@ -98,7 +98,8 @@ public class CancelBundleTask implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CancelBundleTask implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CancelBundleTask implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelBundleTask").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelBundleTask").equals(reader.getName())) {
object.setCancelBundleTask(com.amazon.ec2.CancelBundleTaskType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java b/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java
index 2549aed..3b5e4e5 100644
--- a/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java
+++ b/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java
@@ -98,7 +98,8 @@ public class CancelBundleTaskResponse implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CancelBundleTaskResponse implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java b/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java
index d48ae1b..9da1589 100644
--- a/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java
@@ -125,7 +125,8 @@ public class CancelBundleTaskResponseType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class CancelBundleTaskResponseType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java b/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java
index 9b2b37f..de66899 100644
--- a/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java
+++ b/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java
@@ -101,7 +101,8 @@ public class CancelBundleTaskType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class CancelBundleTaskType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelConversionTask.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelConversionTask.java b/awsapi/src/com/amazon/ec2/CancelConversionTask.java
index 1390c9c..6b5a883 100644
--- a/awsapi/src/com/amazon/ec2/CancelConversionTask.java
+++ b/awsapi/src/com/amazon/ec2/CancelConversionTask.java
@@ -98,7 +98,8 @@ public class CancelConversionTask implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CancelConversionTask implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CancelConversionTask implements org.apache.axis2.databinding.ADBBea
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelConversionTask").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelConversionTask").equals(reader.getName())) {
object.setCancelConversionTask(com.amazon.ec2.CancelConversionTaskType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java b/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java
index ee5c688..97dab3b 100644
--- a/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java
+++ b/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class CancelConversionTaskResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelConversionTaskResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelConversionTaskResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class CancelConversionTaskResponse implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class CancelConversionTaskResponse implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java b/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java
index 9e0b6b4..00b35f2 100644
--- a/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java
@@ -125,7 +125,8 @@ public class CancelConversionTaskResponseType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class CancelConversionTaskResponseType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java b/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java
index 52448c3..2248fb3 100644
--- a/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java
+++ b/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java
@@ -101,7 +101,8 @@ public class CancelConversionTaskType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class CancelConversionTaskType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelExportTask.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelExportTask.java b/awsapi/src/com/amazon/ec2/CancelExportTask.java
index c86ada4..777253c 100644
--- a/awsapi/src/com/amazon/ec2/CancelExportTask.java
+++ b/awsapi/src/com/amazon/ec2/CancelExportTask.java
@@ -98,7 +98,8 @@ public class CancelExportTask implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CancelExportTask implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CancelExportTask implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelExportTask").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelExportTask").equals(reader.getName())) {
object.setCancelExportTask(com.amazon.ec2.CancelExportTaskType.Factory.parse(reader));
[52/54] [abbrv] Broke up some long strings
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
index 303f1e0..f55f58c 100755
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
@@ -154,7 +154,8 @@ public class CloudOrchestrator implements OrchestrationService {
int speed, long memory, Long diskSize, List<String> computeTags, List<String> rootDiskTags, Map<String, NicProfile> networkNicMap, DeploymentPlan plan,
Long rootDiskSize) throws InsufficientCapacityException {
- // VirtualMachineEntityImpl vmEntity = new VirtualMachineEntityImpl(id, owner, hostName, displayName, cpu, speed, memory, computeTags, rootDiskTags, networks, vmEntityManager);
+ // VirtualMachineEntityImpl vmEntity = new VirtualMachineEntityImpl(id, owner, hostName, displayName, cpu, speed, memory, computeTags, rootDiskTags, networks,
+ // vmEntityManager);
LinkedHashMap<NetworkVO, NicProfile> networkIpMap = new LinkedHashMap<NetworkVO, NicProfile>();
for (String uuid : networkNicMap.keySet()) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
index de5a370..cb916c3 100755
--- a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
+++ b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
@@ -163,10 +163,10 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
* */
private static final String LIST_CLUSTERS_CROSSING_THRESHOLD =
"SELECT clusterList.cluster_id "
- + "FROM ( SELECT cluster.cluster_id cluster_id, ( (sum(cluster.used) + sum(cluster.reserved) + ?)/sum(cluster.total) ) ratio, cluster.configValue value "
- + "FROM ( SELECT capacity.cluster_id cluster_id, capacity.used_capacity used, capacity.reserved_capacity reserved, capacity.total_capacity * overcommit.value total, "
+ + "FROM (SELECT cluster.cluster_id cluster_id, ( (sum(cluster.used) + sum(cluster.reserved) + ?)/sum(cluster.total) ) ratio, cluster.configValue value "
+ + "FROM (SELECT capacity.cluster_id cluster_id, capacity.used_capacity used, capacity.reserved_capacity reserved, capacity.total_capacity * overcommit.value total, "
+ "CASE (SELECT count(*) FROM `cloud`.`cluster_details` details WHERE details.cluster_id = capacity.cluster_id AND details.name = ? ) "
- + "WHEN 1 THEN ( CASE WHEN (SELECT details.value FROM `cloud`.`cluster_details` details WHERE details.cluster_id = capacity.cluster_id AND details.name = ?) is NULL "
+ + "WHEN 1 THEN (CASE WHEN (SELECT details.value FROM `cloud`.`cluster_details` details WHERE details.cluster_id = capacity.cluster_id AND details.name = ?) is NULL "
+ "THEN (SELECT config.value FROM `cloud`.`configuration` config WHERE config.name = ?)"
+ "ELSE (SELECT details.value FROM `cloud`.`cluster_details` details WHERE details.cluster_id = capacity.cluster_id AND details.name = ? ) END )"
+ "ELSE ( SELECT config.value FROM `cloud`.`configuration` config WHERE config.name = ?) " + "END configValue "
@@ -561,7 +561,7 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
public SummedCapacity(long sumUsed, long sumReserved, long sumTotal, short capacityType, Long clusterId, Long podId, Long zoneId) {
this(sumUsed, sumReserved, sumTotal, capacityType, clusterId, podId);
- this.dcId = zoneId;
+ dcId = zoneId;
}
public SummedCapacity(long sumUsed, long sumTotal, float percentUsed, short capacityType, Long zoneId, Long podId, Long clusterId) {
@@ -572,7 +572,7 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
this.capacityType = capacityType;
this.clusterId = clusterId;
this.podId = podId;
- this.dcId = zoneId;
+ dcId = zoneId;
}
public SummedCapacity(long sumUsed, long sumReserved, long sumTotal, float percentUsed, short capacityType, Long zoneId, Long podId, Long clusterId) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java
index d4fb1b4..80936c0 100755
--- a/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java
+++ b/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java
@@ -113,8 +113,8 @@ public class DataCenterIpAddressDaoImpl extends GenericDaoBase<DataCenterIpAddre
@DB
public void addIpRange(long dcId, long podId, String start, String end) {
TransactionLegacy txn = TransactionLegacy.currentTxn();
- String insertSql =
- "INSERT INTO `cloud`.`op_dc_ip_address_alloc` (ip_address, data_center_id, pod_id, mac_address) VALUES (?, ?, ?, (select mac_address from `cloud`.`data_center` where id=?))";
+ String insertSql = "INSERT INTO `cloud`.`op_dc_ip_address_alloc` (ip_address, data_center_id, pod_id, mac_address) " +
+ "VALUES (?, ?, ?, (select mac_address from `cloud`.`data_center` where id=?))";
String updateSql = "UPDATE `cloud`.`data_center` set mac_address = mac_address+1 where id=?";
PreparedStatement stmt = null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/engine/schema/src/com/cloud/upgrade/dao/Upgrade2213to2214.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2213to2214.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2213to2214.java
index ce41563..3edefcb 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2213to2214.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2213to2214.java
@@ -300,14 +300,15 @@ public class Upgrade2213to2214 implements DbUpgrade {
DbUpgradeUtils.dropKeysIfExist(conn, "cloud.user_ip_address", keys, true);
DbUpgradeUtils.dropKeysIfExist(conn, "cloud.user_ip_address", keys, false);
try {
- PreparedStatement pstmt =
- conn.prepareStatement("ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__account_id` FOREIGN KEY (`account_id`) REFERENCES `account`(`id`)");
+ PreparedStatement pstmt = conn.prepareStatement(
+ "ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__account_id` FOREIGN KEY (`account_id`) REFERENCES `account`(`id`)");
pstmt.executeUpdate();
- pstmt =
- conn.prepareStatement("ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__vlan_db_id` FOREIGN KEY (`vlan_db_id`) REFERENCES `vlan`(`id`) ON DELETE CASCADE");
+ pstmt = conn.prepareStatement(
+ "ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__vlan_db_id` FOREIGN KEY (`vlan_db_id`) REFERENCES `vlan`(`id`) ON DELETE CASCADE");
pstmt.executeUpdate();
- pstmt =
- conn.prepareStatement("ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__data_center_id` FOREIGN KEY (`data_center_id`) REFERENCES `data_center`(`id`) ON DELETE CASCADE");
+ pstmt = conn.prepareStatement(
+ "ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__data_center_id`" +
+ " FOREIGN KEY (`data_center_id`) REFERENCES `data_center`(`id`) ON DELETE CASCADE");
pstmt.executeUpdate();
pstmt.close();
} catch (SQLException e) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java
index 26d7a43..410c1cc 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java
@@ -183,26 +183,29 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade {
if (vnet != null) {
//check if any vnet is allocated and guest networks are using vnets.
PreparedStatement pstmt4 =
- conn.prepareStatement("SELECT v.* FROM `cloud`.`op_dc_vnet_alloc` v JOIN `cloud`.`networks` n ON CONCAT('vlan://' , v.vnet) = n.broadcast_uri WHERE v.taken IS NOT NULL AND v.data_center_id = ? AND n.removed IS NULL");
+ conn.prepareStatement("SELECT v.* FROM `cloud`.`op_dc_vnet_alloc` v JOIN `cloud`.`networks` n ON CONCAT('vlan://' , v.vnet) = " +
+ "n.broadcast_uri WHERE v.taken IS NOT NULL AND v.data_center_id = ? AND n.removed IS NULL");
pstmt4.setLong(1, zoneId);
ResultSet rsVNet = pstmt4.executeQuery();
if (rsVNet.next()) {
- String message =
- "Cannot upgrade. Your setup has multiple Physical Networks and is using guest Vnet that is assigned wrongly. To upgrade, first correct the setup by doing the following: \n"
- + "1. Please rollback to your 2.2.14 setup\n"
- + "2. Please stop all VMs using isolated(virtual) networks through CloudStack\n"
- + "3. Run following query to find if any networks still have nics allocated:\n\t"
- + "a) check if any virtual guest networks still have allocated nics by running:\n\t"
- + "SELECT DISTINCT op.id from `cloud`.`op_networks` op JOIN `cloud`.`networks` n on op.id=n.id WHERE nics_count != 0 AND guest_type = 'Virtual';\n\t"
- + "b) If this returns any networkd ids, then ensure that all VMs are stopped, no new VM is being started, and then shutdown management server\n\t"
- + "c) Clean up the nics count for the 'virtual' network id's returned in step (a) by running this:\n\t"
- + "UPDATE `cloud`.`op_networks` SET nics_count = 0 WHERE id = <enter id of virtual network>\n\t"
- + "d) Restart management server and wait for all networks to shutdown. [Networks shutdown will be determined by network.gc.interval and network.gc.wait seconds] \n"
- + "4. Please ensure all networks are shutdown and all guest Vnet's are free.\n"
- + "5. Run upgrade. This will allocate all your guest vnet range to first physical network. \n"
- + "6. Reconfigure the vnet ranges for each physical network as desired by using updatePhysicalNetwork API \n"
- + "7. Start all your VMs";
+ String message = "Cannot upgrade. Your setup has multiple Physical Networks and is using guest "
+ + "Vnet that is assigned wrongly. To upgrade, first correct the setup by doing the following: \n"
+ + "1. Please rollback to your 2.2.14 setup\n"
+ + "2. Please stop all VMs using isolated(virtual) networks through CloudStack\n"
+ + "3. Run following query to find if any networks still have nics allocated:\n\t"
+ + "a) check if any virtual guest networks still have allocated nics by running:\n\t"
+ + "SELECT DISTINCT op.id from `cloud`.`op_networks` op JOIN `cloud`.`networks` n on "
+ + "op.id=n.id WHERE nics_count != 0 AND guest_type = 'Virtual';\n\t"
+ + "b) If this returns any networkd ids, then ensure that all VMs are stopped, no new VM is being started, and then shutdown management server\n\t"
+ + "c) Clean up the nics count for the 'virtual' network id's returned in step (a) by running this:\n\t"
+ + "UPDATE `cloud`.`op_networks` SET nics_count = 0 WHERE id = <enter id of virtual network>\n\t"
+ + "d) Restart management server and wait for all networks to shutdown. [Networks shutdown will be "
+ + "determined by network.gc.interval and network.gc.wait seconds] \n"
+ + "4. Please ensure all networks are shutdown and all guest Vnet's are free.\n"
+ + "5. Run upgrade. This will allocate all your guest vnet range to first physical network. \n"
+ + "6. Reconfigure the vnet ranges for each physical network as desired by using updatePhysicalNetwork API \n"
+ + "7. Start all your VMs";
s_logger.error(message);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to40.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to40.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to40.java
index ec75be3..ab5d213 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to40.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to40.java
@@ -297,24 +297,25 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade {
s_logger.error("Guest Vnet assignment is set wrongly . Cannot upgrade until that is corrected. Example- Vnet: " + vnet +
" has physical network id: " + vpid + " ,but the guest network: " + networkId + " that uses it has physical network id: " + npid);
- String message =
- "Cannot upgrade. Your setup has multiple Physical Networks and is using guest Vnet that is assigned wrongly. To upgrade, first correct the setup by doing the following: \n"
- + "1. Please rollback to your 2.2.14 setup\n"
- + "2. Please stop all VMs using isolated(virtual) networks through CloudStack\n"
- + "3. Run following query to find if any networks still have nics allocated:\n\t"
- + "a) check if any virtual guest networks still have allocated nics by running:\n\t"
- + "SELECT DISTINCT op.id from `cloud`.`op_networks` op JOIN `cloud`.`networks` n on op.id=n.id WHERE nics_count != 0 AND guest_type = 'Virtual';\n\t"
- + "b) If this returns any networkd ids, then ensure that all VMs are stopped, no new VM is being started, and then shutdown management server\n\t"
- + "c) Clean up the nics count for the 'virtual' network id's returned in step (a) by running this:\n\t"
- + "UPDATE `cloud`.`op_networks` SET nics_count = 0 WHERE id = <enter id of virtual network>\n\t"
- + "d) Restart management server and wait for all networks to shutdown. [Networks shutdown will be determined by network.gc.interval and network.gc.wait seconds] \n"
- + "4. Please ensure all networks are shutdown and all guest Vnet's are free.\n"
- + "5. Run upgrade. This will allocate all your guest vnet range to first physical network. \n"
- + "6. Reconfigure the vnet ranges for each physical network as desired by using updatePhysicalNetwork API \n" + "7. Start all your VMs";
+ String message = "Cannot upgrade. Your setup has multiple Physical Networks and is using guest Vnet that is assigned wrongly. "
+ + "To upgrade, first correct the setup by doing the following: \n"
+ + "1. Please rollback to your 2.2.14 setup\n"
+ + "2. Please stop all VMs using isolated(virtual) networks through CloudStack\n"
+ + "3. Run following query to find if any networks still have nics allocated:\n\t"
+ + "a) check if any virtual guest networks still have allocated nics by running:\n\t"
+ + "SELECT DISTINCT op.id from `cloud`.`op_networks` op JOIN `cloud`.`networks` n on op.id=n.id WHERE nics_count != 0 AND guest_type = 'Virtual';\n\t"
+ + "b) If this returns any networkd ids, then ensure that all VMs are stopped, no new VM is being started, and then shutdown management server\n\t"
+ + "c) Clean up the nics count for the 'virtual' network id's returned in step (a) by running this:\n\t"
+ + "UPDATE `cloud`.`op_networks` SET nics_count = 0 WHERE id = <enter id of virtual network>\n\t"
+ + "d) Restart management server and wait for all networks to shutdown. [Networks shutdown will be determined by "
+ + "network.gc.interval and network.gc.wait seconds] \n"
+ + "4. Please ensure all networks are shutdown and all guest Vnet's are free.\n"
+ + "5. Run upgrade. This will allocate all your guest vnet range to first physical network. \n"
+ + "6. Reconfigure the vnet ranges for each physical network as desired by using updatePhysicalNetwork API \n" + "7. Start all your VMs";
s_logger.error(message);
- throw new CloudRuntimeException(
- "Cannot upgrade this setup since Guest Vnet assignment to the multiple physical networks is incorrect. Please check the logs for details on how to proceed");
+ throw new CloudRuntimeException("Cannot upgrade this setup since Guest Vnet assignment to the multiple physical " +
+ "networks is incorrect. Please check the logs for details on how to proceed");
}
rsVNet.close();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/engine/schema/src/com/cloud/upgrade/dao/Upgrade303to304.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade303to304.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade303to304.java
index 1e9c652..5c74bca 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade303to304.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade303to304.java
@@ -268,24 +268,25 @@ public class Upgrade303to304 extends Upgrade30xBase implements DbUpgrade {
s_logger.error("Guest Vnet assignment is set wrongly . Cannot upgrade until that is corrected. Example- Vnet: " + vnet +
" has physical network id: " + vpid + " ,but the guest network: " + networkId + " that uses it has physical network id: " + npid);
- String message =
- "Cannot upgrade. Your setup has multiple Physical Networks and is using guest Vnet that is assigned wrongly. To upgrade, first correct the setup by doing the following: \n"
- + "1. Please rollback to your 2.2.14 setup\n"
- + "2. Please stop all VMs using isolated(virtual) networks through CloudStack\n"
- + "3. Run following query to find if any networks still have nics allocated:\n\t"
- + "a) check if any virtual guest networks still have allocated nics by running:\n\t"
- + "SELECT DISTINCT op.id from `cloud`.`op_networks` op JOIN `cloud`.`networks` n on op.id=n.id WHERE nics_count != 0 AND guest_type = 'Virtual';\n\t"
- + "b) If this returns any networkd ids, then ensure that all VMs are stopped, no new VM is being started, and then shutdown management server\n\t"
- + "c) Clean up the nics count for the 'virtual' network id's returned in step (a) by running this:\n\t"
- + "UPDATE `cloud`.`op_networks` SET nics_count = 0 WHERE id = <enter id of virtual network>\n\t"
- + "d) Restart management server and wait for all networks to shutdown. [Networks shutdown will be determined by network.gc.interval and network.gc.wait seconds] \n"
- + "4. Please ensure all networks are shutdown and all guest Vnet's are free.\n"
- + "5. Run upgrade. This will allocate all your guest vnet range to first physical network. \n"
- + "6. Reconfigure the vnet ranges for each physical network as desired by using updatePhysicalNetwork API \n" + "7. Start all your VMs";
+ String message = "Cannot upgrade. Your setup has multiple Physical Networks and is using guest Vnet that is assigned wrongly. "
+ + "To upgrade, first correct the setup by doing the following: \n"
+ + "1. Please rollback to your 2.2.14 setup\n"
+ + "2. Please stop all VMs using isolated(virtual) networks through CloudStack\n"
+ + "3. Run following query to find if any networks still have nics allocated:\n\t"
+ + "a) check if any virtual guest networks still have allocated nics by running:\n\t"
+ + "SELECT DISTINCT op.id from `cloud`.`op_networks` op JOIN `cloud`.`networks` n on op.id=n.id WHERE nics_count != 0 AND guest_type = 'Virtual';\n\t"
+ + "b) If this returns any networkd ids, then ensure that all VMs are stopped, no new VM is being started, and then shutdown management server\n\t"
+ + "c) Clean up the nics count for the 'virtual' network id's returned in step (a) by running this:\n\t"
+ + "UPDATE `cloud`.`op_networks` SET nics_count = 0 WHERE id = <enter id of virtual network>\n\t"
+ + "d) Restart management server and wait for all networks to shutdown. "
+ + "[Networks shutdown will be determined by network.gc.interval and network.gc.wait seconds] \n"
+ + "4. Please ensure all networks are shutdown and all guest Vnet's are free.\n"
+ + "5. Run upgrade. This will allocate all your guest vnet range to first physical network. \n"
+ + "6. Reconfigure the vnet ranges for each physical network as desired by using updatePhysicalNetwork API \n" + "7. Start all your VMs";
s_logger.error(message);
- throw new CloudRuntimeException(
- "Cannot upgrade this setup since Guest Vnet assignment to the multiple physical networks is incorrect. Please check the logs for details on how to proceed");
+ throw new CloudRuntimeException("Cannot upgrade this setup since Guest Vnet assignment to the multiple physical networks " +
+ "is incorrect. Please check the logs for details on how to proceed");
}
rsVNet.close();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/engine/schema/src/com/cloud/upgrade/dao/Upgrade305to306.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade305to306.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade305to306.java
index 9eb4fc4..622f7ea 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade305to306.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade305to306.java
@@ -168,8 +168,8 @@ public class Upgrade305to306 extends Upgrade30xBase implements DbUpgrade {
ResultSet rsNw = null;
try {
// update the existing ingress rules traffic type
- pstmt =
- conn.prepareStatement("update `cloud`.`firewall_rules` set traffic_type='Ingress' where purpose='Firewall' and ip_address_id is not null and traffic_type is null");
+ pstmt = conn.prepareStatement("update `cloud`.`firewall_rules`" +
+ " set traffic_type='Ingress' where purpose='Firewall' and ip_address_id is not null and traffic_type is null");
s_logger.debug("Updating firewall Ingress rule traffic type: " + pstmt);
pstmt.executeUpdate();
@@ -179,8 +179,8 @@ public class Upgrade305to306 extends Upgrade30xBase implements DbUpgrade {
long netId = rs.getLong(1);
//When upgraded from 2.2.14 to 3.0.6 guest_type is updated to Isolated in the 2214to30 clean up sql. clean up executes
//after this. So checking for Isolated OR Virtual
- pstmt =
- conn.prepareStatement("select account_id, domain_id FROM `cloud`.`networks` where (guest_type='Isolated' OR guest_type='Virtual') and traffic_type='Guest' and vpc_id is NULL and (state='implemented' OR state='Shutdown') and id=? ");
+ pstmt = conn.prepareStatement("select account_id, domain_id FROM `cloud`.`networks` where (guest_type='Isolated' OR guest_type='" +
+ "Virtual') and traffic_type='Guest' and vpc_id is NULL and (state='implemented' OR state='Shutdown') and id=? ");
pstmt.setLong(1, netId);
s_logger.debug("Getting account_id, domain_id from networks table: " + pstmt);
rsNw = pstmt.executeQuery();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/engine/schema/src/com/cloud/upgrade/dao/Upgrade40to41.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade40to41.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade40to41.java
index 38c46c6..77e2a6f 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade40to41.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade40to41.java
@@ -109,8 +109,8 @@ public class Upgrade40to41 implements DbUpgrade {
ResultSet rsNw = null;
try {
// update the existing ingress rules traffic type
- pstmt =
- conn.prepareStatement("update `cloud`.`firewall_rules` set traffic_type='Ingress' where purpose='Firewall' and ip_address_id is not null and traffic_type is null");
+ pstmt = conn.prepareStatement("update `cloud`.`firewall_rules` set traffic_type='Ingress' where purpose='Firewall' and ip_address_id is " +
+ "not null and traffic_type is null");
s_logger.debug("Updating firewall Ingress rule traffic type: " + pstmt);
pstmt.executeUpdate();
@@ -120,8 +120,9 @@ public class Upgrade40to41 implements DbUpgrade {
long netId = rs.getLong(1);
//When upgraded from 2.2.14 to 3.0.6 guest_type is updated to Isolated in the 2214to30 clean up sql. clean up executes
//after this. So checking for Isolated OR Virtual
- pstmt =
- conn.prepareStatement("select account_id, domain_id FROM `cloud`.`networks` where (guest_type='Isolated' OR guest_type='Virtual') and traffic_type='Guest' and vpc_id is NULL and (state='implemented' OR state='Shutdown') and id=? ");
+ pstmt = conn.prepareStatement("select account_id, domain_id FROM `cloud`.`networks` where (guest_type='Isolated' OR " +
+ "guest_type='Virtual') and traffic_type='Guest' and vpc_id is NULL and " +
+ "(state='implemented' OR state='Shutdown') and id=? ");
pstmt.setLong(1, netId);
s_logger.debug("Getting account_id, domain_id from networks table: " + pstmt);
rsNw = pstmt.executeQuery();
@@ -132,8 +133,7 @@ public class Upgrade40to41 implements DbUpgrade {
//Add new rule for the existing networks
s_logger.debug("Adding default egress firewall rule for network " + netId);
- pstmt =
- conn.prepareStatement("INSERT INTO firewall_rules (uuid, state, protocol, purpose, account_id, domain_id, network_id, xid, created, traffic_type) VALUES (?, 'Active', 'all', 'Firewall', ?, ?, ?, ?, now(), 'Egress')");
+ pstmt = conn.prepareStatement("INSERT INTO firewall_rules (uuid, state, protocol, purpose, account_id, domain_id, network_id, xid, created, traffic_type) VALUES (?, 'Active', 'all', 'Firewall', ?, ?, ?, ?, now(), 'Egress')");
pstmt.setString(1, UUID.randomUUID().toString());
pstmt.setLong(2, accountId);
pstmt.setLong(3, domainId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
index 57b2483..80497d4 100755
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -2380,10 +2380,10 @@ public class Upgrade410to420 implements DbUpgrade {
storeDetailInsert = conn.prepareStatement("INSERT INTO `cloud`.`image_store_details` (store_id, name, value) values(?, ?, ?)");
// migrate S3 to image_store
- storeInsert =
- conn.prepareStatement("INSERT INTO `cloud`.`image_store` (uuid, name, image_provider_name, protocol, scope, role, created) values(?, ?, 'S3', ?, 'REGION', 'Image', ?)");
- s3Query =
- conn.prepareStatement("select id, uuid, access_key, secret_key, end_point, bucket, https, connection_timeout, max_error_retry, socket_timeout, created from `cloud`.`s3`");
+ storeInsert = conn.prepareStatement("INSERT INTO `cloud`.`image_store` (uuid, name, image_provider_name, protocol, scope, role, created) " +
+ "values(?, ?, 'S3', ?, 'REGION', 'Image', ?)");
+ s3Query = conn.prepareStatement("select id, uuid, access_key, secret_key, end_point, bucket, https, connection_timeout, " +
+ "max_error_retry, socket_timeout, created from `cloud`.`s3`");
rs = s3Query.executeQuery();
while (rs.next()) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java b/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java
index 530860f..3be101b 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java
@@ -146,8 +146,8 @@ public class VersionDaoImpl extends GenericDaoBase<VersionVO, Long> implements V
} else {
pstmt = conn.prepareStatement("SELECT is_static_nat from firewall_rules");
pstmt.executeQuery();
- throw new CloudRuntimeException(
- "Unable to determine the current version, version table exists and empty, nics table doesn't exist, is_static_nat field exists in firewall_rules table");
+ throw new CloudRuntimeException("Unable to determine the current version, version table exists and empty, " +
+ "nics table doesn't exist, is_static_nat field exists in firewall_rules table");
}
} catch (SQLException e) {
s_logger.debug("Assuming the exception means static_nat field doesn't exist in firewall_rules table, returning version 2.2.2");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java
index a2039ec..9582033 100644
--- a/engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java
+++ b/engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java
@@ -69,9 +69,9 @@ public class UsageDaoImpl extends GenericDaoBase<UsageVO, Long> implements Usage
private static final String UPDATE_VM_DISK_STATS =
"UPDATE cloud_usage.vm_disk_statistics SET net_io_read=?, net_io_write=?, current_io_read=?, current_io_write=?, agg_io_read=?, agg_io_write=?, "
+ "net_bytes_read=?, net_bytes_write=?, current_bytes_read=?, current_bytes_write=?, agg_bytes_read=?, agg_bytes_write=? WHERE id=?";
- private static final String INSERT_USGAE_RECORDS =
- "INSERT INTO cloud_usage.cloud_usage (zone_id, account_id, domain_id, description, usage_display, usage_type, raw_usage, vm_instance_id, vm_name, offering_id, template_id, "
- + "usage_id, type, size, network_id, start_date, end_date, virtual_size) VALUES (?,?,?,?,?,?,?,?,?, ?, ?, ?,?,?,?,?,?,?)";
+ private static final String INSERT_USGAE_RECORDS = "INSERT INTO cloud_usage.cloud_usage (zone_id, account_id, domain_id, description, usage_display, " +
+ "usage_type, raw_usage, vm_instance_id, vm_name, offering_id, template_id, "
+ + "usage_id, type, size, network_id, start_date, end_date, virtual_size) VALUES (?,?,?,?,?,?,?,?,?, ?, ?, ?,?,?,?,?,?,?)";
protected final static TimeZone s_gmtTimeZone = TimeZone.getTimeZone("GMT");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java
index afa730b..3e75930 100644
--- a/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java
+++ b/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java
@@ -39,13 +39,13 @@ public class UsageVmDiskDaoImpl extends GenericDaoBase<UsageVmDiskVO, Long> impl
private static final String SELECT_LATEST_STATS =
"SELECT uvd.account_id, uvd.zone_id, uvd.vm_id, uvd.volume_id, uvd.io_read, uvd.io_write, uvd.agg_io_read, uvd.agg_io_write, "
+ "uvd.bytes_read, uvd.bytes_write, uvd.agg_bytes_read, uvd.agg_bytes_write, uvd.event_time_millis "
- + "FROM cloud_usage.usage_vm_disk uvd INNER JOIN (SELECT vmdiskusage.account_id as acct_id, vmdiskusage.zone_id as z_id, max(vmdiskusage.event_time_millis) as max_date "
- + "FROM cloud_usage.usage_vm_disk vmdiskusage " + "GROUP BY vmdiskusage.account_id, vmdiskusage.zone_id "
+ + "FROM cloud_usage.usage_vm_disk uvd INNER JOIN (SELECT vmdiskusage.account_id as acct_id, vmdiskusage.zone_id as z_id, max(vmdiskusage.event_time_millis) as "
+ + "max_date FROM cloud_usage.usage_vm_disk vmdiskusage " + "GROUP BY vmdiskusage.account_id, vmdiskusage.zone_id "
+ ") joinnet on uvd.account_id = joinnet.acct_id and uvd.zone_id = joinnet.z_id and uvd.event_time_millis = joinnet.max_date";
private static final String DELETE_OLD_STATS = "DELETE FROM cloud_usage.usage_vm_disk WHERE event_time_millis < ?";
- private static final String INSERT_USAGE_VM_DISK =
- "INSERT INTO cloud_usage.usage_vm_disk (account_id, zone_id, vm_id, volume_id, io_read, io_write, agg_io_read, agg_io_write, bytes_read, bytes_write, agg_bytes_read, agg_bytes_write, event_time_millis) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)";
+ private static final String INSERT_USAGE_VM_DISK = "INSERT INTO cloud_usage.usage_vm_disk (account_id, zone_id, vm_id, volume_id, io_read, io_write, agg_io_read," +
+ " agg_io_write, bytes_read, bytes_write, agg_bytes_read, agg_bytes_write, event_time_millis) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)";
public UsageVmDiskDaoImpl() {
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
index d84016e..43bdef1 100755
--- a/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
+++ b/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
@@ -82,25 +82,25 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use
"SELECT pod_id FROM cloud.vm_instance WHERE data_center_id = ? AND account_id = ? AND pod_id IS NOT NULL AND (state = 'Running' OR state = 'Stopped') "
+ "GROUP BY pod_id HAVING count(id) > 0 ORDER BY count(id) DESC";
- private static String VM_DETAILS =
- "select vm_instance.id, "
- + "account.id, account.account_name, account.type, domain.name, instance_group.id, instance_group.name,"
- + "data_center.id, data_center.name, data_center.is_security_group_enabled, host.id, host.name, "
- + "vm_template.id, vm_template.name, vm_template.display_text, iso.id, iso.name, "
- + "vm_template.enable_password, service_offering.id, disk_offering.name, storage_pool.id, storage_pool.pool_type, "
- + "service_offering.cpu, service_offering.speed, service_offering.ram_size, volumes.id, volumes.device_id, volumes.volume_type, security_group.id, security_group.name, "
- + "security_group.description, nics.id, nics.ip4_address, nics.default_nic, nics.gateway, nics.network_id, nics.netmask, nics.mac_address, nics.broadcast_uri, nics.isolation_uri, "
- + "networks.traffic_type, networks.guest_type, user_ip_address.id, user_ip_address.public_ip_address from vm_instance "
- + "left join account on vm_instance.account_id=account.id " + "left join domain on vm_instance.domain_id=domain.id "
- + "left join instance_group_vm_map on vm_instance.id=instance_group_vm_map.instance_id "
- + "left join instance_group on instance_group_vm_map.group_id=instance_group.id " + "left join data_center on vm_instance.data_center_id=data_center.id "
- + "left join host on vm_instance.host_id=host.id " + "left join vm_template on vm_instance.vm_template_id=vm_template.id "
- + "left join user_vm on vm_instance.id=user_vm.id " + "left join vm_template iso on iso.id=user_vm.iso_id "
- + "left join service_offering on vm_instance.service_offering_id=service_offering.id "
- + "left join disk_offering on vm_instance.service_offering_id=disk_offering.id " + "left join volumes on vm_instance.id=volumes.instance_id "
- + "left join storage_pool on volumes.pool_id=storage_pool.id " + "left join security_group_vm_map on vm_instance.id=security_group_vm_map.instance_id "
- + "left join security_group on security_group_vm_map.security_group_id=security_group.id " + "left join nics on vm_instance.id=nics.instance_id "
- + "left join networks on nics.network_id=networks.id " + "left join user_ip_address on user_ip_address.vm_id=vm_instance.id " + "where vm_instance.id in (";
+ private static String VM_DETAILS = "select vm_instance.id, "
+ + "account.id, account.account_name, account.type, domain.name, instance_group.id, instance_group.name,"
+ + "data_center.id, data_center.name, data_center.is_security_group_enabled, host.id, host.name, "
+ + "vm_template.id, vm_template.name, vm_template.display_text, iso.id, iso.name, "
+ + "vm_template.enable_password, service_offering.id, disk_offering.name, storage_pool.id, storage_pool.pool_type, "
+ + "service_offering.cpu, service_offering.speed, service_offering.ram_size, volumes.id, volumes.device_id, volumes.volume_type, security_group.id, security_group.name, "
+ + "security_group.description, nics.id, nics.ip4_address, nics.default_nic, nics.gateway, nics.network_id, nics.netmask, nics.mac_address, nics.broadcast_uri, " +
+ "nics.isolation_uri, "
+ + "networks.traffic_type, networks.guest_type, user_ip_address.id, user_ip_address.public_ip_address from vm_instance "
+ + "left join account on vm_instance.account_id=account.id " + "left join domain on vm_instance.domain_id=domain.id "
+ + "left join instance_group_vm_map on vm_instance.id=instance_group_vm_map.instance_id "
+ + "left join instance_group on instance_group_vm_map.group_id=instance_group.id " + "left join data_center on vm_instance.data_center_id=data_center.id "
+ + "left join host on vm_instance.host_id=host.id " + "left join vm_template on vm_instance.vm_template_id=vm_template.id "
+ + "left join user_vm on vm_instance.id=user_vm.id " + "left join vm_template iso on iso.id=user_vm.iso_id "
+ + "left join service_offering on vm_instance.service_offering_id=service_offering.id "
+ + "left join disk_offering on vm_instance.service_offering_id=disk_offering.id " + "left join volumes on vm_instance.id=volumes.instance_id "
+ + "left join storage_pool on volumes.pool_id=storage_pool.id " + "left join security_group_vm_map on vm_instance.id=security_group_vm_map.instance_id "
+ + "left join security_group on security_group_vm_map.security_group_id=security_group.id " + "left join nics on vm_instance.id=nics.instance_id "
+ + "left join networks on nics.network_id=networks.id " + "left join user_ip_address on user_ip_address.vm_id=vm_instance.id " + "where vm_instance.id in (";
private static final int VM_DETAILS_BATCH_SIZE = 100;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
index 2381e5f..f45042c 100644
--- a/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
+++ b/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
@@ -95,18 +95,18 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
protected Attribute _updateTimeAttr;
- private static final String ORDER_CLUSTERS_NUMBER_OF_VMS_FOR_ACCOUNT_PART1 =
- "SELECT host.cluster_id, SUM(IF(vm.state='Running' AND vm.account_id = ?, 1, 0)) FROM `cloud`.`host` host LEFT JOIN `cloud`.`vm_instance` vm ON host.id = vm.host_id WHERE ";
- private static final String ORDER_CLUSTERS_NUMBER_OF_VMS_FOR_ACCOUNT_PART2 =
- " AND host.type = 'Routing' AND host.removed is null GROUP BY host.cluster_id ORDER BY 2 ASC ";
+ private static final String ORDER_CLUSTERS_NUMBER_OF_VMS_FOR_ACCOUNT_PART1 = "SELECT host.cluster_id, SUM(IF(vm.state='Running' AND vm.account_id = ?, 1, 0)) " +
+ "FROM `cloud`.`host` host LEFT JOIN `cloud`.`vm_instance` vm ON host.id = vm.host_id WHERE ";
+ private static final String ORDER_CLUSTERS_NUMBER_OF_VMS_FOR_ACCOUNT_PART2 = " AND host.type = 'Routing' AND host.removed is null GROUP BY host.cluster_id " +
+ "ORDER BY 2 ASC ";
- private static final String ORDER_PODS_NUMBER_OF_VMS_FOR_ACCOUNT =
- "SELECT pod.id, SUM(IF(vm.state='Running' AND vm.account_id = ?, 1, 0)) FROM `cloud`.`host_pod_ref` pod LEFT JOIN `cloud`.`vm_instance` vm ON pod.id = vm.pod_id WHERE pod.data_center_id = ? AND pod.removed is null "
+ private static final String ORDER_PODS_NUMBER_OF_VMS_FOR_ACCOUNT = "SELECT pod.id, SUM(IF(vm.state='Running' AND vm.account_id = ?, 1, 0)) FROM `cloud`.`" +
+ "host_pod_ref` pod LEFT JOIN `cloud`.`vm_instance` vm ON pod.id = vm.pod_id WHERE pod.data_center_id = ? AND pod.removed is null "
+ " GROUP BY pod.id ORDER BY 2 ASC ";
private static final String ORDER_HOSTS_NUMBER_OF_VMS_FOR_ACCOUNT =
- "SELECT host.id, SUM(IF(vm.state='Running' AND vm.account_id = ?, 1, 0)) FROM `cloud`.`host` host LEFT JOIN `cloud`.`vm_instance` vm ON host.id = vm.host_id WHERE host.data_center_id = ? "
- + " AND host.type = 'Routing' AND host.removed is null ";
+ "SELECT host.id, SUM(IF(vm.state='Running' AND vm.account_id = ?, 1, 0)) FROM `cloud`.`host` host LEFT JOIN `cloud`.`vm_instance` vm ON host.id = vm.host_id " +
+ "WHERE host.data_center_id = ? AND host.type = 'Routing' AND host.removed is null ";
private static final String ORDER_HOSTS_NUMBER_OF_VMS_FOR_ACCOUNT_PART2 = " GROUP BY host.id ORDER BY 2 ASC ";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fb4765d..c271a42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -445,6 +445,7 @@
<outputDirectory>${basedir}/${cs.target.dir}/classes</outputDirectory>
<testOutputDirectory>${basedir}/${cs.target.dir}/test-classes</testOutputDirectory>
<plugins>
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -471,9 +472,10 @@
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<sourceDirectory>${project.basedir}</sourceDirectory>
<includes>**\/*.java</includes>
- <excludes>**\/test\/,**\/target\/,**\/bin\/,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat</excludes>
+ <excludes>**\/deps\/,**\/test\/,**\/target\/,**\/bin\/,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat</excludes>
</configuration>
</plugin>
+ -->
</plugins>
<pluginManagement>
<plugins>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/server/src/com/cloud/capacity/CapacityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java
index 1ec2e74..c733c03 100755
--- a/server/src/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -327,7 +327,8 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
/* alloc from free resource */
if (!((reservedCpu + usedCpu + cpu <= totalCpu) && (reservedMem + usedMem + ram <= totalMem))) {
if (s_logger.isDebugEnabled()) {
- s_logger.debug("Host doesnt seem to have enough free capacity, but increasing the used capacity anyways, since the VM is already starting on this host ");
+ s_logger.debug("Host doesnt seem to have enough free capacity, but increasing the used capacity anyways, " +
+ "since the VM is already starting on this host ");
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
index a14c880..848ef1f 100644
--- a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
+++ b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
@@ -399,13 +399,14 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService,
continue;
} else if (!oneOfRulesIsFirewall &&
!(bothRulesFirewall && !duplicatedCidrs) &&
- ((rule.getSourcePortStart().intValue() <= newRule.getSourcePortStart().intValue() && rule.getSourcePortEnd().intValue() >= newRule.getSourcePortStart()
- .intValue()) ||
- (rule.getSourcePortStart().intValue() <= newRule.getSourcePortEnd().intValue() && rule.getSourcePortEnd().intValue() >= newRule.getSourcePortEnd()
- .intValue()) ||
- (newRule.getSourcePortStart().intValue() <= rule.getSourcePortStart().intValue() && newRule.getSourcePortEnd().intValue() >= rule.getSourcePortStart()
- .intValue()) || (newRule.getSourcePortStart().intValue() <= rule.getSourcePortEnd().intValue() && newRule.getSourcePortEnd().intValue() >= rule.getSourcePortEnd()
- .intValue()))) {
+ ((rule.getSourcePortStart().intValue() <= newRule.getSourcePortStart().intValue() &&
+ rule.getSourcePortEnd().intValue() >= newRule.getSourcePortStart().intValue()) ||
+ (rule.getSourcePortStart().intValue() <= newRule.getSourcePortEnd().intValue() &&
+ rule.getSourcePortEnd().intValue() >= newRule.getSourcePortEnd().intValue()) ||
+ (newRule.getSourcePortStart().intValue() <= rule.getSourcePortStart().intValue() &&
+ newRule.getSourcePortEnd().intValue() >= rule.getSourcePortStart().intValue()) ||
+ (newRule.getSourcePortStart().intValue() <= rule.getSourcePortEnd().intValue() &&
+ newRule.getSourcePortEnd().intValue() >= rule.getSourcePortEnd().intValue()))) {
// we allow port forwarding rules with the same parameters but different protocols
boolean allowPf =
@@ -928,7 +929,7 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService,
@Inject
public void setFirewallElements(List<FirewallServiceProvider> firewallElements) {
- this._firewallElements = firewallElements;
+ _firewallElements = firewallElements;
}
public List<PortForwardingServiceProvider> getPfElements() {
@@ -937,7 +938,7 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService,
@Inject
public void setPfElements(List<PortForwardingServiceProvider> pfElements) {
- this._pfElements = pfElements;
+ _pfElements = pfElements;
}
public List<StaticNatServiceProvider> getStaticNatElements() {
@@ -946,7 +947,7 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService,
@Inject
public void setStaticNatElements(List<StaticNatServiceProvider> staticNatElements) {
- this._staticNatElements = staticNatElements;
+ _staticNatElements = staticNatElements;
}
public List<NetworkACLServiceProvider> getNetworkAclElements() {
@@ -955,7 +956,7 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService,
@Inject
public void setNetworkAclElements(List<NetworkACLServiceProvider> networkAclElements) {
- this._networkAclElements = networkAclElements;
+ _networkAclElements = networkAclElements;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
index 2388a7f..56ba66a 100644
--- a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
+++ b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
@@ -658,9 +658,6 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrches
return null;
}
- /* (non-Javadoc)
- * @see com.cloud.network.NetworkManager#prepareNic(com.cloud.vm.VirtualMachineProfile, com.cloud.deploy.DeployDestination, com.cloud.vm.ReservationContext, long, com.cloud.network.NetworkVO)
- */
@Override
public NicProfile prepareNic(VirtualMachineProfile vmProfile, DeployDestination dest, ReservationContext context, long nicId, Network network)
throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, ConcurrentOperationException, InsufficientCapacityException,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/test/src/com/cloud/test/regression/PortForwardingTest.java
----------------------------------------------------------------------
diff --git a/test/src/com/cloud/test/regression/PortForwardingTest.java b/test/src/com/cloud/test/regression/PortForwardingTest.java
index dd95c89..24415fd 100644
--- a/test/src/com/cloud/test/regression/PortForwardingTest.java
+++ b/test/src/com/cloud/test/regression/PortForwardingTest.java
@@ -29,15 +29,15 @@ public class PortForwardingTest extends TestCase {
public static final Logger s_logger = Logger.getLogger(PortForwardingTest.class.getName());
public PortForwardingTest() {
- this.setClient();
- this.setParam(new HashMap<String, String>());
+ setClient();
+ setParam(new HashMap<String, String>());
}
@Override
public boolean executeTest() {
int error = 0;
- Element rootElement = this.getInputFile().get(0).getDocumentElement();
+ Element rootElement = getInputFile().get(0).getDocumentElement();
NodeList commandLst = rootElement.getElementsByTagName("command");
//Analyze each command, send request and build the array list of api commands
@@ -47,10 +47,10 @@ public class PortForwardingTest extends TestCase {
Element fstElmnt = (Element)fstNode;
//new command
- ApiCommand api = new ApiCommand(fstElmnt, this.getParam(), this.getCommands());
+ ApiCommand api = new ApiCommand(fstElmnt, getParam(), getCommands());
//send a command
- api.sendCommand(this.getClient(), null);
+ api.sendCommand(getClient(), null);
//verify the response of the command
if ((api.getResponseType() != ResponseType.ERROR) && (api.getResponseCode() == 200)) {
@@ -70,7 +70,7 @@ public class PortForwardingTest extends TestCase {
s_logger.error("Test case " + api.getTestCaseInfo() + " failed. Non-empty response was expected. Command was sent with url " + api.getUrl());
else {
//set parameters for the future use
- if (api.setParam(this.getParam()) == false) {
+ if (api.setParam(getParam()) == false) {
s_logger.error("Exiting the test...Command " + api.getName() +
" didn't return parameters needed for the future use. The command was sent with url " + api.getUrl());
return false;
@@ -119,7 +119,8 @@ public class PortForwardingTest extends TestCase {
// //try all private ports
// for (String portValue : port) {
// try {
-// String url = this.getHost() + ":8096/?command=createOrUpdateIpForwardingRule&account=" + this.getParam().get("accountname") + "&publicip=" + this.getParam().get("boundaryip") +
+// String url = this.getHost() + ":8096/?command=createOrUpdateIpForwardingRule&account=" +
+// this.getParam().get("accountname") + "&publicip=" + this.getParam().get("boundaryip") +
// "&privateip=" + this.getParam().get("vmipaddress") + "&publicport=22&protocol=tcp&privateport=" + portValue;
// HttpClient client = new HttpClient();
// HttpMethod method = new GetMethod(url);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
index 0ddbea2..44d9f0c 100755
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
@@ -540,7 +540,6 @@ public class VmwareContext {
vmware-6.log</a></td><td align="right">15-Aug-2010 00:11</td><td align="right">59742</td></tr>
<tr><td><a href="/folder/Fedora%2dclone%2dtest/vmware%2d7%2elog?dcPath=cupertino&dsName=NFS%20datastore">
vmware-7.log</a></td><td align="right">15-Aug-2010 00:13</td><td align="right">59859</td></tr>
-
<tr><td><a href="/folder/Fedora%2dclone%2dtest/vmware%2elog?dcPath=cupertino&dsName=NFS%20datastore">
vmware.log</a></td><td align="right">15-Aug-2010 00:23</td><td align="right">47157</td></tr>
<tr><th colspan="5"><hr></th></tr>
[13/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/AccessControlList.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/AccessControlList.java b/awsapi/src/com/amazon/s3/AccessControlList.java
index 20117d3..ab78d99 100644
--- a/awsapi/src/com/amazon/s3/AccessControlList.java
+++ b/awsapi/src/com/amazon/s3/AccessControlList.java
@@ -146,7 +146,8 @@ public class AccessControlList implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -212,9 +213,8 @@ public class AccessControlList implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/AccessControlPolicy.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/AccessControlPolicy.java b/awsapi/src/com/amazon/s3/AccessControlPolicy.java
index af8d17f..4fdce2a 100644
--- a/awsapi/src/com/amazon/s3/AccessControlPolicy.java
+++ b/awsapi/src/com/amazon/s3/AccessControlPolicy.java
@@ -125,7 +125,8 @@ public class AccessControlPolicy implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -184,9 +185,8 @@ public class AccessControlPolicy implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/AmazonCustomerByEmail.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/AmazonCustomerByEmail.java b/awsapi/src/com/amazon/s3/AmazonCustomerByEmail.java
index 501a9b9..efc830a 100644
--- a/awsapi/src/com/amazon/s3/AmazonCustomerByEmail.java
+++ b/awsapi/src/com/amazon/s3/AmazonCustomerByEmail.java
@@ -101,7 +101,8 @@ public class AmazonCustomerByEmail extends com.amazon.s3.User implements org.apa
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -178,9 +179,8 @@ public class AmazonCustomerByEmail extends com.amazon.s3.User implements org.apa
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/AmazonS3MessageReceiverInOut.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/AmazonS3MessageReceiverInOut.java b/awsapi/src/com/amazon/s3/AmazonS3MessageReceiverInOut.java
index 528c5fd..0e8c332 100644
--- a/awsapi/src/com/amazon/s3/AmazonS3MessageReceiverInOut.java
+++ b/awsapi/src/com/amazon/s3/AmazonS3MessageReceiverInOut.java
@@ -29,7 +29,8 @@ package com.amazon.s3;
public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.AbstractInOutMessageReceiver {
- public void invokeBusinessLogic(org.apache.axis2.context.MessageContext msgContext, org.apache.axis2.context.MessageContext newMsgContext) throws org.apache.axis2.AxisFault {
+ public void invokeBusinessLogic(org.apache.axis2.context.MessageContext msgContext, org.apache.axis2.context.MessageContext newMsgContext)
+ throws org.apache.axis2.AxisFault {
try {
@@ -52,12 +53,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
if ("getBucketLoggingStatus".equals(methodName)) {
com.amazon.s3.GetBucketLoggingStatusResponse getBucketLoggingStatusResponse33 = null;
- com.amazon.s3.GetBucketLoggingStatus wrappedParam = (com.amazon.s3.GetBucketLoggingStatus)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.s3.GetBucketLoggingStatus.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.s3.GetBucketLoggingStatus wrappedParam =
+ (com.amazon.s3.GetBucketLoggingStatus)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.GetBucketLoggingStatus.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
getBucketLoggingStatusResponse33 =
- skel.getBucketLoggingStatus(wrappedParam);
+ skel.getBucketLoggingStatus(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), getBucketLoggingStatusResponse33, false);
} else
@@ -65,12 +67,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
if ("copyObject".equals(methodName)) {
com.amazon.s3.CopyObjectResponse copyObjectResponse35 = null;
- com.amazon.s3.CopyObject wrappedParam = (com.amazon.s3.CopyObject)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.CopyObject.class,
- getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.s3.CopyObject wrappedParam =
+ (com.amazon.s3.CopyObject)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.CopyObject.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
copyObjectResponse35 =
- skel.copyObject(wrappedParam);
+ skel.copyObject(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), copyObjectResponse35, false);
} else
@@ -78,13 +81,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
if ("getBucketAccessControlPolicy".equals(methodName)) {
com.amazon.s3.GetBucketAccessControlPolicyResponse getBucketAccessControlPolicyResponse37 = null;
- com.amazon.s3.GetBucketAccessControlPolicy wrappedParam = (com.amazon.s3.GetBucketAccessControlPolicy)fromOM(msgContext.getEnvelope()
- .getBody()
- .getFirstElement(), com.amazon.s3.GetBucketAccessControlPolicy.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.s3.GetBucketAccessControlPolicy wrappedParam =
+ (com.amazon.s3.GetBucketAccessControlPolicy)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.s3.GetBucketAccessControlPolicy.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
getBucketAccessControlPolicyResponse37 =
- skel.getBucketAccessControlPolicy(wrappedParam);
+ skel.getBucketAccessControlPolicy(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), getBucketAccessControlPolicyResponse37, false);
} else
@@ -92,12 +95,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
if ("listBucket".equals(methodName)) {
com.amazon.s3.ListBucketResponse listBucketResponse39 = null;
- com.amazon.s3.ListBucket wrappedParam = (com.amazon.s3.ListBucket)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.ListBucket.class,
- getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.s3.ListBucket wrappedParam =
+ (com.amazon.s3.ListBucket)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.ListBucket.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
listBucketResponse39 =
- skel.listBucket(wrappedParam);
+ skel.listBucket(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), listBucketResponse39, false);
} else
@@ -105,12 +109,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
if ("putObject".equals(methodName)) {
com.amazon.s3.PutObjectResponse putObjectResponse41 = null;
- com.amazon.s3.PutObject wrappedParam = (com.amazon.s3.PutObject)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.PutObject.class,
- getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.s3.PutObject wrappedParam =
+ (com.amazon.s3.PutObject)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.PutObject.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
putObjectResponse41 =
- skel.putObject(wrappedParam);
+ skel.putObject(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), putObjectResponse41, false);
} else
@@ -118,12 +123,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
if ("createBucket".equals(methodName)) {
com.amazon.s3.CreateBucketResponse createBucketResponse43 = null;
- com.amazon.s3.CreateBucket wrappedParam = (com.amazon.s3.CreateBucket)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.s3.CreateBucket.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.s3.CreateBucket wrappedParam =
+ (com.amazon.s3.CreateBucket)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.CreateBucket.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
createBucketResponse43 =
- skel.createBucket(wrappedParam);
+ skel.createBucket(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), createBucketResponse43, false);
} else
@@ -131,12 +137,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
if ("listAllMyBuckets".equals(methodName)) {
com.amazon.s3.ListAllMyBucketsResponse listAllMyBucketsResponse45 = null;
- com.amazon.s3.ListAllMyBuckets wrappedParam = (com.amazon.s3.ListAllMyBuckets)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.s3.ListAllMyBuckets.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.s3.ListAllMyBuckets wrappedParam =
+ (com.amazon.s3.ListAllMyBuckets)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.ListAllMyBuckets.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
listAllMyBucketsResponse45 =
- skel.listAllMyBuckets(wrappedParam);
+ skel.listAllMyBuckets(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), listAllMyBucketsResponse45, false);
} else
@@ -144,12 +151,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
if ("getObject".equals(methodName)) {
com.amazon.s3.GetObjectResponse getObjectResponse47 = null;
- com.amazon.s3.GetObject wrappedParam = (com.amazon.s3.GetObject)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.GetObject.class,
- getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.s3.GetObject wrappedParam =
+ (com.amazon.s3.GetObject)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.GetObject.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
getObjectResponse47 =
- skel.getObject(wrappedParam);
+ skel.getObject(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), getObjectResponse47, false);
} else
@@ -157,12 +165,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
if ("deleteBucket".equals(methodName)) {
com.amazon.s3.DeleteBucketResponse deleteBucketResponse49 = null;
- com.amazon.s3.DeleteBucket wrappedParam = (com.amazon.s3.DeleteBucket)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.s3.DeleteBucket.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.s3.DeleteBucket wrappedParam =
+ (com.amazon.s3.DeleteBucket)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.DeleteBucket.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
deleteBucketResponse49 =
- skel.deleteBucket(wrappedParam);
+ skel.deleteBucket(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), deleteBucketResponse49, false);
} else
@@ -170,12 +179,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
if ("setBucketLoggingStatus".equals(methodName)) {
com.amazon.s3.SetBucketLoggingStatusResponse setBucketLoggingStatusResponse51 = null;
- com.amazon.s3.SetBucketLoggingStatus wrappedParam = (com.amazon.s3.SetBucketLoggingStatus)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.s3.SetBucketLoggingStatus.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.s3.SetBucketLoggingStatus wrappedParam =
+ (com.amazon.s3.SetBucketLoggingStatus)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.SetBucketLoggingStatus.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
setBucketLoggingStatusResponse51 =
- skel.setBucketLoggingStatus(wrappedParam);
+ skel.setBucketLoggingStatus(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), setBucketLoggingStatusResponse51, false);
} else
@@ -183,13 +193,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
if ("getObjectAccessControlPolicy".equals(methodName)) {
com.amazon.s3.GetObjectAccessControlPolicyResponse getObjectAccessControlPolicyResponse53 = null;
- com.amazon.s3.GetObjectAccessControlPolicy wrappedParam = (com.amazon.s3.GetObjectAccessControlPolicy)fromOM(msgContext.getEnvelope()
- .getBody()
- .getFirstElement(), com.amazon.s3.GetObjectAccessControlPolicy.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.s3.GetObjectAccessControlPolicy wrappedParam =
+ (com.amazon.s3.GetObjectAccessControlPolicy)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.s3.GetObjectAccessControlPolicy.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
getObjectAccessControlPolicyResponse53 =
- skel.getObjectAccessControlPolicy(wrappedParam);
+ skel.getObjectAccessControlPolicy(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), getObjectAccessControlPolicyResponse53, false);
} else
@@ -197,12 +207,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
if ("deleteObject".equals(methodName)) {
com.amazon.s3.DeleteObjectResponse deleteObjectResponse55 = null;
- com.amazon.s3.DeleteObject wrappedParam = (com.amazon.s3.DeleteObject)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.s3.DeleteObject.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.s3.DeleteObject wrappedParam =
+ (com.amazon.s3.DeleteObject)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.DeleteObject.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
deleteObjectResponse55 =
- skel.deleteObject(wrappedParam);
+ skel.deleteObject(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), deleteObjectResponse55, false);
} else
@@ -210,13 +221,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
if ("setBucketAccessControlPolicy".equals(methodName)) {
com.amazon.s3.SetBucketAccessControlPolicyResponse setBucketAccessControlPolicyResponse57 = null;
- com.amazon.s3.SetBucketAccessControlPolicy wrappedParam = (com.amazon.s3.SetBucketAccessControlPolicy)fromOM(msgContext.getEnvelope()
- .getBody()
- .getFirstElement(), com.amazon.s3.SetBucketAccessControlPolicy.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.s3.SetBucketAccessControlPolicy wrappedParam =
+ (com.amazon.s3.SetBucketAccessControlPolicy)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.s3.SetBucketAccessControlPolicy.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
setBucketAccessControlPolicyResponse57 =
- skel.setBucketAccessControlPolicy(wrappedParam);
+ skel.setBucketAccessControlPolicy(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), setBucketAccessControlPolicyResponse57, false);
} else
@@ -224,13 +235,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
if ("setObjectAccessControlPolicy".equals(methodName)) {
com.amazon.s3.SetObjectAccessControlPolicyResponse setObjectAccessControlPolicyResponse59 = null;
- com.amazon.s3.SetObjectAccessControlPolicy wrappedParam = (com.amazon.s3.SetObjectAccessControlPolicy)fromOM(msgContext.getEnvelope()
- .getBody()
- .getFirstElement(), com.amazon.s3.SetObjectAccessControlPolicy.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.s3.SetObjectAccessControlPolicy wrappedParam =
+ (com.amazon.s3.SetObjectAccessControlPolicy)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.s3.SetObjectAccessControlPolicy.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
setObjectAccessControlPolicyResponse59 =
- skel.setObjectAccessControlPolicy(wrappedParam);
+ skel.setObjectAccessControlPolicy(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), setObjectAccessControlPolicyResponse59, false);
} else
@@ -238,12 +249,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
if ("putObjectInline".equals(methodName)) {
com.amazon.s3.PutObjectInlineResponse putObjectInlineResponse61 = null;
- com.amazon.s3.PutObjectInline wrappedParam = (com.amazon.s3.PutObjectInline)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.s3.PutObjectInline.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.s3.PutObjectInline wrappedParam =
+ (com.amazon.s3.PutObjectInline)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.PutObjectInline.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
putObjectInlineResponse61 =
- skel.putObjectInline(wrappedParam);
+ skel.putObjectInline(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), putObjectInlineResponse61, false);
} else
@@ -251,12 +263,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
if ("getObjectExtended".equals(methodName)) {
com.amazon.s3.GetObjectExtendedResponse getObjectExtendedResponse63 = null;
- com.amazon.s3.GetObjectExtended wrappedParam = (com.amazon.s3.GetObjectExtended)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.s3.GetObjectExtended.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.s3.GetObjectExtended wrappedParam =
+ (com.amazon.s3.GetObjectExtended)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.GetObjectExtended.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
getObjectExtendedResponse63 =
- skel.getObjectExtended(wrappedParam);
+ skel.getObjectExtended(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), getObjectExtendedResponse63, false);
@@ -592,8 +605,8 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
}
- private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.GetBucketLoggingStatusResponse param, boolean optimizeContent)
- throws org.apache.axis2.AxisFault {
+ private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.GetBucketLoggingStatusResponse param,
+ boolean optimizeContent) throws org.apache.axis2.AxisFault {
try {
org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope();
@@ -700,8 +713,8 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
return wrappedElement;
}
- private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.ListAllMyBucketsResponse param, boolean optimizeContent)
- throws org.apache.axis2.AxisFault {
+ private org.apache.axiom.soap.SOAPEnvelope
+ toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.ListAllMyBucketsResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault {
try {
org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope();
@@ -754,8 +767,8 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
return wrappedElement;
}
- private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.SetBucketLoggingStatusResponse param, boolean optimizeContent)
- throws org.apache.axis2.AxisFault {
+ private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.SetBucketLoggingStatusResponse param,
+ boolean optimizeContent) throws org.apache.axis2.AxisFault {
try {
org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope();
@@ -844,8 +857,8 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
return wrappedElement;
}
- private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.PutObjectInlineResponse param, boolean optimizeContent)
- throws org.apache.axis2.AxisFault {
+ private org.apache.axiom.soap.SOAPEnvelope
+ toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.PutObjectInlineResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault {
try {
org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope();
@@ -862,8 +875,8 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs
return wrappedElement;
}
- private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.GetObjectExtendedResponse param, boolean optimizeContent)
- throws org.apache.axis2.AxisFault {
+ private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.GetObjectExtendedResponse param,
+ boolean optimizeContent) throws org.apache.axis2.AxisFault {
try {
org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/BucketLoggingStatus.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/BucketLoggingStatus.java b/awsapi/src/com/amazon/s3/BucketLoggingStatus.java
index 7636365..879b21a 100644
--- a/awsapi/src/com/amazon/s3/BucketLoggingStatus.java
+++ b/awsapi/src/com/amazon/s3/BucketLoggingStatus.java
@@ -115,7 +115,8 @@ public class BucketLoggingStatus implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -169,9 +170,8 @@ public class BucketLoggingStatus implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/CanonicalUser.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/CanonicalUser.java b/awsapi/src/com/amazon/s3/CanonicalUser.java
index 88eea88..e12ceea 100644
--- a/awsapi/src/com/amazon/s3/CanonicalUser.java
+++ b/awsapi/src/com/amazon/s3/CanonicalUser.java
@@ -139,7 +139,8 @@ public class CanonicalUser extends com.amazon.s3.User implements org.apache.axis
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -248,9 +249,8 @@ public class CanonicalUser extends com.amazon.s3.User implements org.apache.axis
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/CopyObject.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/CopyObject.java b/awsapi/src/com/amazon/s3/CopyObject.java
index 354f5a8..0e42ab4 100644
--- a/awsapi/src/com/amazon/s3/CopyObject.java
+++ b/awsapi/src/com/amazon/s3/CopyObject.java
@@ -719,7 +719,8 @@ public class CopyObject implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -1215,9 +1216,8 @@ public class CopyObject implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -1712,7 +1712,8 @@ public class CopyObject implements org.apache.axis2.databinding.ADBBean {
}
// call the converter utility to convert and set the array
- object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class, list6));
+ object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class,
+ list6));
} // End of if for expected property start element
@@ -1738,7 +1739,8 @@ public class CopyObject implements org.apache.axis2.databinding.ADBBean {
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CopySourceIfModifiedSince").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CopySourceIfModifiedSince").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
@@ -1755,7 +1757,8 @@ public class CopyObject implements org.apache.axis2.databinding.ADBBean {
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CopySourceIfUnmodifiedSince").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CopySourceIfUnmodifiedSince").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/CopyObjectResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/CopyObjectResponse.java b/awsapi/src/com/amazon/s3/CopyObjectResponse.java
index f87ddff..7769b4f 100644
--- a/awsapi/src/com/amazon/s3/CopyObjectResponse.java
+++ b/awsapi/src/com/amazon/s3/CopyObjectResponse.java
@@ -98,7 +98,8 @@ public class CopyObjectResponse implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -152,9 +153,8 @@ public class CopyObjectResponse implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/CopyObjectResult.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/CopyObjectResult.java b/awsapi/src/com/amazon/s3/CopyObjectResult.java
index 122f31b..bdab18c 100644
--- a/awsapi/src/com/amazon/s3/CopyObjectResult.java
+++ b/awsapi/src/com/amazon/s3/CopyObjectResult.java
@@ -125,7 +125,8 @@ public class CopyObjectResult implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class CopyObjectResult implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/CreateBucket.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/CreateBucket.java b/awsapi/src/com/amazon/s3/CreateBucket.java
index a160781..8f7cc0e 100644
--- a/awsapi/src/com/amazon/s3/CreateBucket.java
+++ b/awsapi/src/com/amazon/s3/CreateBucket.java
@@ -250,7 +250,8 @@ public class CreateBucket implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -435,9 +436,8 @@ public class CreateBucket implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/CreateBucketConfiguration.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/CreateBucketConfiguration.java b/awsapi/src/com/amazon/s3/CreateBucketConfiguration.java
index ce8a2f1..3f0c4e2 100644
--- a/awsapi/src/com/amazon/s3/CreateBucketConfiguration.java
+++ b/awsapi/src/com/amazon/s3/CreateBucketConfiguration.java
@@ -101,7 +101,8 @@ public class CreateBucketConfiguration implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -155,9 +156,8 @@ public class CreateBucketConfiguration implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/CreateBucketResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/CreateBucketResponse.java b/awsapi/src/com/amazon/s3/CreateBucketResponse.java
index 87d4654..58504f5 100644
--- a/awsapi/src/com/amazon/s3/CreateBucketResponse.java
+++ b/awsapi/src/com/amazon/s3/CreateBucketResponse.java
@@ -98,7 +98,8 @@ public class CreateBucketResponse implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -152,9 +153,8 @@ public class CreateBucketResponse implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/CreateBucketResult.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/CreateBucketResult.java b/awsapi/src/com/amazon/s3/CreateBucketResult.java
index 3555aa9..ca20267 100644
--- a/awsapi/src/com/amazon/s3/CreateBucketResult.java
+++ b/awsapi/src/com/amazon/s3/CreateBucketResult.java
@@ -101,7 +101,8 @@ public class CreateBucketResult implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class CreateBucketResult implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/DeleteBucket.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/DeleteBucket.java b/awsapi/src/com/amazon/s3/DeleteBucket.java
index 6413b45..b116203 100644
--- a/awsapi/src/com/amazon/s3/DeleteBucket.java
+++ b/awsapi/src/com/amazon/s3/DeleteBucket.java
@@ -250,7 +250,8 @@ public class DeleteBucket implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -462,9 +463,8 @@ public class DeleteBucket implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/DeleteBucketResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/DeleteBucketResponse.java b/awsapi/src/com/amazon/s3/DeleteBucketResponse.java
index 0bd703d..cc46b8f 100644
--- a/awsapi/src/com/amazon/s3/DeleteBucketResponse.java
+++ b/awsapi/src/com/amazon/s3/DeleteBucketResponse.java
@@ -98,7 +98,8 @@ public class DeleteBucketResponse implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -152,9 +153,8 @@ public class DeleteBucketResponse implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/DeleteMarkerEntry.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/DeleteMarkerEntry.java b/awsapi/src/com/amazon/s3/DeleteMarkerEntry.java
index ee18d30..91e80f3 100644
--- a/awsapi/src/com/amazon/s3/DeleteMarkerEntry.java
+++ b/awsapi/src/com/amazon/s3/DeleteMarkerEntry.java
@@ -211,7 +211,8 @@ public class DeleteMarkerEntry implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -390,9 +391,8 @@ public class DeleteMarkerEntry implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/DeleteObject.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/DeleteObject.java b/awsapi/src/com/amazon/s3/DeleteObject.java
index 05c42be..7545740 100644
--- a/awsapi/src/com/amazon/s3/DeleteObject.java
+++ b/awsapi/src/com/amazon/s3/DeleteObject.java
@@ -274,7 +274,8 @@ public class DeleteObject implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -518,9 +519,8 @@ public class DeleteObject implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/DeleteObjectResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/DeleteObjectResponse.java b/awsapi/src/com/amazon/s3/DeleteObjectResponse.java
index 440164d..caf1a9c 100644
--- a/awsapi/src/com/amazon/s3/DeleteObjectResponse.java
+++ b/awsapi/src/com/amazon/s3/DeleteObjectResponse.java
@@ -98,7 +98,8 @@ public class DeleteObjectResponse implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -152,9 +153,8 @@ public class DeleteObjectResponse implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/ExtensionMapper.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/ExtensionMapper.java b/awsapi/src/com/amazon/s3/ExtensionMapper.java
index fd2a662..9e90777 100644
--- a/awsapi/src/com/amazon/s3/ExtensionMapper.java
+++ b/awsapi/src/com/amazon/s3/ExtensionMapper.java
@@ -30,7 +30,8 @@ package com.amazon.s3;
public class ExtensionMapper {
- public static java.lang.Object getTypeObject(java.lang.String namespaceURI, java.lang.String typeName, javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
+ public static java.lang.Object getTypeObject(java.lang.String namespaceURI, java.lang.String typeName, javax.xml.stream.XMLStreamReader reader)
+ throws java.lang.Exception {
if ("http://s3.amazonaws.com/doc/2006-03-01/".equals(namespaceURI) && "PutObjectResult".equals(typeName)) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/GetBucketAccessControlPolicy.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/GetBucketAccessControlPolicy.java b/awsapi/src/com/amazon/s3/GetBucketAccessControlPolicy.java
index f4308b1..b4b6edd 100644
--- a/awsapi/src/com/amazon/s3/GetBucketAccessControlPolicy.java
+++ b/awsapi/src/com/amazon/s3/GetBucketAccessControlPolicy.java
@@ -30,7 +30,8 @@ package com.amazon.s3;
public class GetBucketAccessControlPolicy implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketAccessControlPolicy", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketAccessControlPolicy",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) {
@@ -250,7 +251,8 @@ public class GetBucketAccessControlPolicy implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -462,9 +464,8 @@ public class GetBucketAccessControlPolicy implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/GetBucketAccessControlPolicyResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/GetBucketAccessControlPolicyResponse.java b/awsapi/src/com/amazon/s3/GetBucketAccessControlPolicyResponse.java
index a101dc3..eeb634f 100644
--- a/awsapi/src/com/amazon/s3/GetBucketAccessControlPolicyResponse.java
+++ b/awsapi/src/com/amazon/s3/GetBucketAccessControlPolicyResponse.java
@@ -30,7 +30,8 @@ package com.amazon.s3;
public class GetBucketAccessControlPolicyResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketAccessControlPolicyResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/",
+ "GetBucketAccessControlPolicyResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) {
@@ -98,7 +99,8 @@ public class GetBucketAccessControlPolicyResponse implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -143,8 +145,8 @@ public class GetBucketAccessControlPolicyResponse implements org.apache.axis2.da
if (localGetBucketAccessControlPolicyResponse == null) {
throw new org.apache.axis2.databinding.ADBException("GetBucketAccessControlPolicyResponse cannot be null!!");
}
- localGetBucketAccessControlPolicyResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketAccessControlPolicyResponse"),
- factory, xmlWriter);
+ localGetBucketAccessControlPolicyResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/",
+ "GetBucketAccessControlPolicyResponse"), factory, xmlWriter);
xmlWriter.writeEndElement();
@@ -153,9 +155,8 @@ public class GetBucketAccessControlPolicyResponse implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/GetBucketLoggingStatus.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/GetBucketLoggingStatus.java b/awsapi/src/com/amazon/s3/GetBucketLoggingStatus.java
index a383c58..cac715d 100644
--- a/awsapi/src/com/amazon/s3/GetBucketLoggingStatus.java
+++ b/awsapi/src/com/amazon/s3/GetBucketLoggingStatus.java
@@ -250,7 +250,8 @@ public class GetBucketLoggingStatus implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -462,9 +463,8 @@ public class GetBucketLoggingStatus implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/GetBucketLoggingStatusResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/GetBucketLoggingStatusResponse.java b/awsapi/src/com/amazon/s3/GetBucketLoggingStatusResponse.java
index 9f53630..9b2d1ac 100644
--- a/awsapi/src/com/amazon/s3/GetBucketLoggingStatusResponse.java
+++ b/awsapi/src/com/amazon/s3/GetBucketLoggingStatusResponse.java
@@ -30,7 +30,8 @@ package com.amazon.s3;
public class GetBucketLoggingStatusResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketLoggingStatusResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketLoggingStatusResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) {
@@ -98,7 +99,8 @@ public class GetBucketLoggingStatusResponse implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -143,8 +145,8 @@ public class GetBucketLoggingStatusResponse implements org.apache.axis2.databind
if (localGetBucketLoggingStatusResponse == null) {
throw new org.apache.axis2.databinding.ADBException("GetBucketLoggingStatusResponse cannot be null!!");
}
- localGetBucketLoggingStatusResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketLoggingStatusResponse"), factory,
- xmlWriter);
+ localGetBucketLoggingStatusResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketLoggingStatusResponse"),
+ factory, xmlWriter);
xmlWriter.writeEndElement();
@@ -153,9 +155,8 @@ public class GetBucketLoggingStatusResponse implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -361,7 +362,8 @@ public class GetBucketLoggingStatusResponse implements org.apache.axis2.databind
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketLoggingStatusResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketLoggingStatusResponse").equals(reader.getName())) {
object.setGetBucketLoggingStatusResponse(com.amazon.s3.BucketLoggingStatus.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/GetObject.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/GetObject.java b/awsapi/src/com/amazon/s3/GetObject.java
index e3d456c..b460721 100644
--- a/awsapi/src/com/amazon/s3/GetObject.java
+++ b/awsapi/src/com/amazon/s3/GetObject.java
@@ -346,7 +346,8 @@ public class GetObject implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -677,9 +678,8 @@ public class GetObject implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/GetObjectAccessControlPolicy.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/GetObjectAccessControlPolicy.java b/awsapi/src/com/amazon/s3/GetObjectAccessControlPolicy.java
index 9f3109e..bd12b4e 100644
--- a/awsapi/src/com/amazon/s3/GetObjectAccessControlPolicy.java
+++ b/awsapi/src/com/amazon/s3/GetObjectAccessControlPolicy.java
@@ -30,7 +30,8 @@ package com.amazon.s3;
public class GetObjectAccessControlPolicy implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetObjectAccessControlPolicy", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetObjectAccessControlPolicy",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) {
@@ -274,7 +275,8 @@ public class GetObjectAccessControlPolicy implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -518,9 +520,8 @@ public class GetObjectAccessControlPolicy implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/GetObjectAccessControlPolicyResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/GetObjectAccessControlPolicyResponse.java b/awsapi/src/com/amazon/s3/GetObjectAccessControlPolicyResponse.java
index 3df1d7e..21ffb37 100644
--- a/awsapi/src/com/amazon/s3/GetObjectAccessControlPolicyResponse.java
+++ b/awsapi/src/com/amazon/s3/GetObjectAccessControlPolicyResponse.java
@@ -30,7 +30,8 @@ package com.amazon.s3;
public class GetObjectAccessControlPolicyResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetObjectAccessControlPolicyResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/",
+ "GetObjectAccessControlPolicyResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) {
@@ -98,7 +99,8 @@ public class GetObjectAccessControlPolicyResponse implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -143,8 +145,8 @@ public class GetObjectAccessControlPolicyResponse implements org.apache.axis2.da
if (localGetObjectAccessControlPolicyResponse == null) {
throw new org.apache.axis2.databinding.ADBException("GetObjectAccessControlPolicyResponse cannot be null!!");
}
- localGetObjectAccessControlPolicyResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetObjectAccessControlPolicyResponse"),
- factory, xmlWriter);
+ localGetObjectAccessControlPolicyResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/",
+ "GetObjectAccessControlPolicyResponse"), factory, xmlWriter);
xmlWriter.writeEndElement();
@@ -153,9 +155,8 @@ public class GetObjectAccessControlPolicyResponse implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/GetObjectExtended.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/GetObjectExtended.java b/awsapi/src/com/amazon/s3/GetObjectExtended.java
index b5a4636..c3fcfb1 100644
--- a/awsapi/src/com/amazon/s3/GetObjectExtended.java
+++ b/awsapi/src/com/amazon/s3/GetObjectExtended.java
@@ -677,7 +677,8 @@ public class GetObjectExtended implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -1250,9 +1251,8 @@ public class GetObjectExtended implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/GetObjectExtendedResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/GetObjectExtendedResponse.java b/awsapi/src/com/amazon/s3/GetObjectExtendedResponse.java
index 340025d..c6e6d55 100644
--- a/awsapi/src/com/amazon/s3/GetObjectExtendedResponse.java
+++ b/awsapi/src/com/amazon/s3/GetObjectExtendedResponse.java
@@ -98,7 +98,8 @@ public class GetObjectExtendedResponse implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -152,9 +153,8 @@ public class GetObjectExtendedResponse implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/GetObjectResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/GetObjectResponse.java b/awsapi/src/com/amazon/s3/GetObjectResponse.java
index ba7fd17..bf29a62 100644
--- a/awsapi/src/com/amazon/s3/GetObjectResponse.java
+++ b/awsapi/src/com/amazon/s3/GetObjectResponse.java
@@ -98,7 +98,8 @@ public class GetObjectResponse implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -152,9 +153,8 @@ public class GetObjectResponse implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/GetObjectResult.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/GetObjectResult.java b/awsapi/src/com/amazon/s3/GetObjectResult.java
index 6e09527..e4991b5 100644
--- a/awsapi/src/com/amazon/s3/GetObjectResult.java
+++ b/awsapi/src/com/amazon/s3/GetObjectResult.java
@@ -214,7 +214,8 @@ public class GetObjectResult extends com.amazon.s3.Result implements org.apache.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -370,9 +371,8 @@ public class GetObjectResult extends com.amazon.s3.Result implements org.apache.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -669,7 +669,8 @@ public class GetObjectResult extends com.amazon.s3.Result implements org.apache.
}
// call the converter utility to convert and set the array
- object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class, list2));
+ object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class,
+ list2));
} // End of if for expected property start element
@@ -688,7 +689,8 @@ public class GetObjectResult extends com.amazon.s3.Result implements org.apache.
} else {
if (reader.getEventType() == javax.xml.stream.XMLStreamConstants.START_ELEMENT &&
reader.getName().equals(
- new javax.xml.namespace.QName(org.apache.axiom.om.impl.MTOMConstants.XOP_NAMESPACE_URI, org.apache.axiom.om.impl.MTOMConstants.XOP_INCLUDE))) {
+ new javax.xml.namespace.QName(org.apache.axiom.om.impl.MTOMConstants.XOP_NAMESPACE_URI,
+ org.apache.axiom.om.impl.MTOMConstants.XOP_INCLUDE))) {
java.lang.String id = org.apache.axiom.om.util.ElementHelper.getContentID(reader, "UTF-8");
object.setData(((org.apache.axiom.soap.impl.builder.MTOMStAXSOAPModelBuilder)((org.apache.axiom.om.impl.llom.OMStAXWrapper)reader).getBuilder()).getDataHandler(id));
reader.next();
[44/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java
index 4b498ca..d5683b0 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java
@@ -16,16 +16,26 @@
// under the License.
package org.apache.cloudstack.api.command.user.loadbalancer;
-import com.cloud.network.lb.CertService;
+import javax.inject.Inject;
+
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SslCertResponse;
-import com.cloud.exception.*;
-import com.cloud.utils.exception.CloudRuntimeException;
-import org.apache.cloudstack.api.*;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-import javax.inject.Inject;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.lb.CertService;
+import com.cloud.utils.exception.CloudRuntimeException;
@APICommand(name = "deleteSslCert", description = "Delete a certificate to cloudstack", responseObject = SuccessResponse.class)
public class DeleteSslCertCmd extends BaseCmd {
@@ -56,8 +66,8 @@ public class DeleteSslCertCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException,
- NetworkRuleConflictException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException, NetworkRuleConflictException {
try {
_certService.deleteSslCert(this);
SuccessResponse rsp = new SuccessResponse();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
index 9c13022..05572c8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.loadbalancer;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
@@ -28,7 +30,6 @@ import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.network.lb.ApplicationLoadBalancerRule;
-import org.apache.log4j.Logger;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.rules.LoadBalancerContainer.Scheme;
@@ -53,7 +54,10 @@ public class ListApplicationLoadBalancersCmd extends BaseListTaggedResourcesCmd
@Parameter(name = ApiConstants.SOURCE_IP, type = CommandType.STRING, description = "the source ip address of the Load Balancer")
private String sourceIp;
- @Parameter(name = ApiConstants.SOURCE_IP_NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "the network id of the source ip address")
+ @Parameter(name = ApiConstants.SOURCE_IP_NETWORK_ID,
+ type = CommandType.UUID,
+ entityType = NetworkResponse.class,
+ description = "the network id of the source ip address")
private Long sourceIpNetworkId;
@Parameter(name = ApiConstants.SCHEME, type = CommandType.STRING, description = "the scheme of the Load Balancer. Supported value is Internal in the current release")
@@ -116,7 +120,8 @@ public class ListApplicationLoadBalancersCmd extends BaseListTaggedResourcesCmd
ListResponse<ApplicationLoadBalancerResponse> response = new ListResponse<ApplicationLoadBalancerResponse>();
List<ApplicationLoadBalancerResponse> lbResponses = new ArrayList<ApplicationLoadBalancerResponse>();
for (ApplicationLoadBalancerRule loadBalancer : loadBalancers.first()) {
- ApplicationLoadBalancerResponse lbResponse = _responseGenerator.createLoadBalancerContainerReponse(loadBalancer, _lbService.getLbInstances(loadBalancer.getId()));
+ ApplicationLoadBalancerResponse lbResponse =
+ _responseGenerator.createLoadBalancerContainerReponse(loadBalancer, _lbService.getLbInstances(loadBalancer.getId()));
lbResponse.setObjectName("loadbalancer");
lbResponses.add(lbResponse);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java
index c28685b..8aa286f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java
@@ -19,22 +19,18 @@ package org.apache.cloudstack.api.command.user.loadbalancer;
import java.util.ArrayList;
import java.util.List;
-import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.response.FirewallRuleResponse;
-
import org.apache.log4j.Logger;
+import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.LBHealthCheckResponse;
-import org.apache.cloudstack.api.response.LBStickinessResponse;
import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.cloudstack.context.CallContext;
import com.cloud.network.rules.HealthCheckPolicy;
import com.cloud.network.rules.LoadBalancer;
-import com.cloud.user.Account;
@APICommand(name = "listLBHealthCheckPolicies", description = "Lists load balancer HealthCheck policies.", responseObject = LBHealthCheckResponse.class, since = "4.2.0")
public class ListLBHealthCheckPoliciesCmd extends BaseListCmd {
@@ -45,7 +41,11 @@ public class ListLBHealthCheckPoliciesCmd extends BaseListCmd {
// ///////////////////////////////////////////////////
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.LBID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule")
+ @Parameter(name = ApiConstants.LBID,
+ type = CommandType.UUID,
+ entityType = FirewallRuleResponse.class,
+ required = true,
+ description = "the ID of the load balancer rule")
private Long lbRuleId;
// ///////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
index df5bb3c..ade4878 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.loadbalancer;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.LBStickinessResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.network.rules.LoadBalancer;
import com.cloud.network.rules.StickinessPolicy;
import com.cloud.user.Account;
@@ -43,7 +43,11 @@ public class ListLBStickinessPoliciesCmd extends BaseListCmd {
// ///////////////////////////////////////////////////
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.LBID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule")
+ @Parameter(name = ApiConstants.LBID,
+ type = CommandType.UUID,
+ entityType = FirewallRuleResponse.class,
+ required = true,
+ description = "the ID of the load balancer rule")
private Long lbRuleId;
// ///////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
index 140cd29..2a39e1a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
@@ -17,9 +17,10 @@
package org.apache.cloudstack.api.command.user.loadbalancer;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -27,7 +28,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.log4j.Logger;
import com.cloud.uservm.UserVm;
import com.cloud.utils.Pair;
@@ -49,7 +49,11 @@ public class ListLoadBalancerRuleInstancesCmd extends BaseListCmd {
description = "true if listing all virtual machines currently applied to the load balancer rule; default is true")
private Boolean applied;
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = FirewallRuleResponse.class,
+ required = true,
+ description = "the ID of the load balancer rule")
private Long id;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java
index 56fd1fe..663f991 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.loadbalancer;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
@@ -30,7 +32,6 @@ import org.apache.cloudstack.api.response.LoadBalancerResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.rules.LoadBalancer;
import com.cloud.utils.Pair;
@@ -51,7 +52,10 @@ public class ListLoadBalancerRulesCmd extends BaseListTaggedResourcesCmd {
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "the name of the load balancer rule")
private String loadBalancerRuleName;
- @Parameter(name = ApiConstants.PUBLIC_IP_ID, type = CommandType.UUID, entityType = IPAddressResponse.class, description = "the public IP address id of the load balancer rule ")
+ @Parameter(name = ApiConstants.PUBLIC_IP_ID,
+ type = CommandType.UUID,
+ entityType = IPAddressResponse.class,
+ description = "the public IP address id of the load balancer rule ")
private Long publicIpId;
@Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
index cbdab71..7f8118a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
@@ -16,21 +16,24 @@
// under the License.
package org.apache.cloudstack.api.command.user.loadbalancer;
-import org.apache.cloudstack.api.response.FirewallRuleResponse;
-import org.apache.cloudstack.api.response.SslCertResponse;
-import com.cloud.network.lb.CertService;
-import com.cloud.utils.exception.CloudRuntimeException;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.AccountResponse;
+import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.SslCertResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-import javax.inject.Inject;
-import java.util.List;
+import com.cloud.network.lb.CertService;
+import com.cloud.utils.exception.CloudRuntimeException;
@APICommand(name = "listSslCerts", description = "Lists SSL certificates", responseObject = SslCertResponse.class)
public class ListSslCertsCmd extends BaseCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
index 5dc5287..e92d208 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
@@ -16,14 +16,25 @@
// under the License.
package org.apache.cloudstack.api.command.user.loadbalancer;
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.FirewallRuleResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+
import com.cloud.event.EventTypes;
-import com.cloud.exception.*;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.rules.LoadBalancer;
import com.cloud.user.Account;
-import org.apache.cloudstack.api.*;
-import org.apache.cloudstack.api.response.FirewallRuleResponse;
-import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
@APICommand(name = "removeCertFromLoadBalancer", description = "Removes a certificate from a Load Balancer Rule", responseObject = SuccessResponse.class)
public class RemoveCertFromLoadBalancerCmd extends BaseAsyncCmd {
@@ -32,12 +43,16 @@ public class RemoveCertFromLoadBalancerCmd extends BaseAsyncCmd {
private static final String s_name = "removeCertFromLoadBalancer";
- @Parameter(name = ApiConstants.LBID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule")
+ @Parameter(name = ApiConstants.LBID,
+ type = CommandType.UUID,
+ entityType = FirewallRuleResponse.class,
+ required = true,
+ description = "the ID of the load balancer rule")
Long lbRuleId;
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException,
- NetworkRuleConflictException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException, NetworkRuleConflictException {
boolean result = _lbService.removeCertFromLoadBalancer(getLbRuleId());
if (result) {
SuccessResponse response = new SuccessResponse(getCommandName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java
index 1978ee1..5027ad3 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.loadbalancer;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -29,8 +31,6 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.rules.LoadBalancer;
@@ -49,7 +49,11 @@ public class RemoveFromLoadBalancerRuleCmd extends BaseAsyncCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "The ID of the load balancer rule")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = FirewallRuleResponse.class,
+ required = true,
+ description = "The ID of the load balancer rule")
private Long id;
@Parameter(name = ApiConstants.VIRTUAL_MACHINE_IDS,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java
index dd7384b..d68167d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.loadbalancer;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.LoadBalancerResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.rules.LoadBalancer;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
index 4c6db6e..00bd013 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
@@ -16,14 +16,25 @@
// under the License.
package org.apache.cloudstack.api.command.user.loadbalancer;
+import javax.inject.Inject;
+
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SslCertResponse;
-import com.cloud.exception.*;
-import com.cloud.network.lb.CertService;
-import org.apache.cloudstack.api.*;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-import javax.inject.Inject;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.lb.CertService;
@APICommand(name = "uploadSslCert", description = "Upload a certificate to cloudstack", responseObject = SslCertResponse.class)
public class UploadSslCertCmd extends BaseCmd {
@@ -75,8 +86,8 @@ public class UploadSslCertCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException,
- NetworkRuleConflictException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException, NetworkRuleConflictException {
try {
SslCertResponse response = _certService.uploadSslCert(this);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
index 69902d6..0917d52 100644
--- a/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.nat;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -31,8 +33,6 @@ import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.api.response.IpForwardingRuleResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.NetworkRuleConflictException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
index 17325d3..351d3ae 100644
--- a/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.nat;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -25,7 +27,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.user.firewall.DeletePortForwardingRuleCmd;
import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.exception.InsufficientAddressCapacityException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java
index 1b91173..832cbc2 100644
--- a/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.nat;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.NetworkRuleConflictException;
@@ -45,27 +46,24 @@ public class EnableStaticNatCmd extends BaseCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.IP_ADDRESS_ID,
- type = CommandType.UUID,
- entityType = IPAddressResponse.class,
- required = true,
- description = "the public IP " + "address id for which static nat feature is being enabled")
+ @Parameter(name = ApiConstants.IP_ADDRESS_ID, type = CommandType.UUID, entityType = IPAddressResponse.class, required = true, description = "the public IP "
+ + "address id for which static nat feature is being enabled")
private Long ipAddressId;
- @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
- type = CommandType.UUID,
- entityType = UserVmResponse.class,
- required = true,
- description = "the ID of " + "the virtual machine for enabling static nat feature")
+ @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, required = true, description = "the ID of "
+ + "the virtual machine for enabling static nat feature")
private Long virtualMachineId;
@Parameter(name = ApiConstants.NETWORK_ID,
type = CommandType.UUID,
entityType = NetworkResponse.class,
description = "The network of the vm the static nat will be enabled for."
- + " Required when public Ip address is not associated with any Guest network yet (VPC case)")
+ + " Required when public Ip address is not associated with any Guest network yet (VPC case)")
private Long networkId;
- @Parameter(name = ApiConstants.VM_GUEST_IP, type = CommandType.STRING, required = false, description = "VM guest nic Secondary ip address for the port forwarding rule")
+ @Parameter(name = ApiConstants.VM_GUEST_IP,
+ type = CommandType.STRING,
+ required = false,
+ description = "VM guest nic Secondary ip address for the port forwarding rule")
private String vmSecondaryIp;
/////////////////////////////////////////////////////
@@ -104,7 +102,7 @@ public class EnableStaticNatCmd extends BaseCmd {
if (ntwkId == null) {
throw new InvalidParameterValueException("Unable to enable static nat for the ipAddress id=" + ipAddressId +
- " as ip is not associated with any network and no networkId is passed in");
+ " as ip is not associated with any network and no networkId is passed in");
}
return ntwkId;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java
index 08d45f7..dca1c23 100644
--- a/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.nat;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
@@ -28,7 +30,6 @@ import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.api.response.IpForwardingRuleResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.rules.FirewallRule;
import com.cloud.network.rules.StaticNatRule;
@@ -44,13 +45,19 @@ public class ListIpForwardingRulesCmd extends BaseListProjectAndAccountResources
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.IP_ADDRESS_ID, type = CommandType.UUID, entityType = IPAddressResponse.class, description = "list the rule belonging to this public ip address")
+ @Parameter(name = ApiConstants.IP_ADDRESS_ID,
+ type = CommandType.UUID,
+ entityType = IPAddressResponse.class,
+ description = "list the rule belonging to this public ip address")
private Long publicIpAddressId;
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, description = "Lists rule with the specified ID.")
private Long id;
- @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, description = "Lists all rules applied to the specified Vm.")
+ @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
+ type = CommandType.UUID,
+ entityType = UserVmResponse.class,
+ description = "Lists all rules applied to the specified Vm.")
private Long vmId;
/////////////////////////////////////////////////////
@@ -79,8 +86,9 @@ public class ListIpForwardingRulesCmd extends BaseListProjectAndAccountResources
@Override
public void execute() {
- Pair<List<? extends FirewallRule>, Integer> result = _rulesService.searchStaticNatRules(publicIpAddressId, id, vmId, this.getStartIndex(), this.getPageSizeVal(),
- this.getAccountName(), this.getDomainId(), this.getProjectId(), this.isRecursive(), this.listAll());
+ Pair<List<? extends FirewallRule>, Integer> result =
+ _rulesService.searchStaticNatRules(publicIpAddressId, id, vmId, this.getStartIndex(), this.getPageSizeVal(), this.getAccountName(), this.getDomainId(),
+ this.getProjectId(), this.isRecursive(), this.listAll());
ListResponse<IpForwardingRuleResponse> response = new ListResponse<IpForwardingRuleResponse>();
List<IpForwardingRuleResponse> ipForwardingResponses = new ArrayList<IpForwardingRuleResponse>();
for (FirewallRule rule : result.first()) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
index 8d2aa25..9934a4f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
@@ -40,7 +40,9 @@ import com.cloud.network.vpc.NetworkACLItem;
import com.cloud.user.Account;
import com.cloud.utils.net.NetUtils;
-@APICommand(name = "createNetworkACL", description = "Creates a ACL rule in the given network (the network has to belong to VPC)", responseObject = NetworkACLItemResponse.class)
+@APICommand(name = "createNetworkACL",
+ description = "Creates a ACL rule in the given network (the network has to belong to VPC)",
+ responseObject = NetworkACLItemResponse.class)
public class CreateNetworkACLCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateNetworkACLCmd.class.getName());
@@ -71,14 +73,20 @@ public class CreateNetworkACLCmd extends BaseAsyncCreateCmd {
@Parameter(name = ApiConstants.ICMP_CODE, type = CommandType.INTEGER, description = "error code for this icmp message")
private Integer icmpCode;
- @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "The network of the vm the ACL will be created for")
+ @Parameter(name = ApiConstants.NETWORK_ID,
+ type = CommandType.UUID,
+ entityType = NetworkResponse.class,
+ description = "The network of the vm the ACL will be created for")
private Long networkId;
- @Parameter(name = ApiConstants.ACL_ID, type = CommandType.UUID, entityType = NetworkACLResponse.class, description = "The network of the vm the ACL will be created for")
+ @Parameter(name = ApiConstants.ACL_ID,
+ type = CommandType.UUID,
+ entityType = NetworkACLResponse.class,
+ description = "The network of the vm the ACL will be created for")
private Long aclId;
@Parameter(name = ApiConstants.TRAFFIC_TYPE, type = CommandType.STRING, description = "the traffic type for the ACL,"
- + "can be Ingress or Egress, defaulted to Ingress if not specified")
+ + "can be Ingress or Egress, defaulted to Ingress if not specified")
private String trafficType;
@Parameter(name = ApiConstants.NUMBER, type = CommandType.INTEGER, description = "The network of the vm the ACL will be created for")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
index 3760337..c1e56ebd 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
@@ -75,18 +75,18 @@ public class CreateNetworkCmd extends BaseCmd {
private Long physicalNetworkId;
@Parameter(name = ApiConstants.GATEWAY, type = CommandType.STRING, description = "the gateway of the network. Required "
- + "for Shared networks and Isolated networks when it belongs to VPC")
+ + "for Shared networks and Isolated networks when it belongs to VPC")
private String gateway;
@Parameter(name = ApiConstants.NETMASK, type = CommandType.STRING, description = "the netmask of the network. Required "
- + "for Shared networks and Isolated networks when it belongs to VPC")
+ + "for Shared networks and Isolated networks when it belongs to VPC")
private String netmask;
@Parameter(name = ApiConstants.START_IP, type = CommandType.STRING, description = "the beginning IP address in the network IP range")
private String startIp;
@Parameter(name = ApiConstants.END_IP, type = CommandType.STRING, description = "the ending IP address in the network IP"
- + " range. If not specified, will be defaulted to startIP")
+ + " range. If not specified, will be defaulted to startIP")
private String endIp;
@Parameter(name = ApiConstants.VLAN, type = CommandType.STRING, description = "the ID or VID of the network")
@@ -98,10 +98,9 @@ public class CreateNetworkCmd extends BaseCmd {
@Parameter(name = ApiConstants.NETWORK_DOMAIN, type = CommandType.STRING, description = "network domain")
private String networkDomain;
- @Parameter(name = ApiConstants.ACL_TYPE,
- type = CommandType.STRING,
- description = "Access control type; supported values" + " are account and domain. In 3.0 all shared networks should have aclType=Domain, and all Isolated networks"
- + " - Account. Account means that only the account owner can use the network, domain - all accouns in the domain can use the network")
+ @Parameter(name = ApiConstants.ACL_TYPE, type = CommandType.STRING, description = "Access control type; supported values"
+ + " are account and domain. In 3.0 all shared networks should have aclType=Domain, and all Isolated networks"
+ + " - Account. Account means that only the account owner can use the network, domain - all accouns in the domain can use the network")
private String aclType;
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "account who will own the network")
@@ -116,7 +115,7 @@ public class CreateNetworkCmd extends BaseCmd {
@Parameter(name = ApiConstants.SUBDOMAIN_ACCESS,
type = CommandType.BOOLEAN,
description = "Defines whether to allow"
- + " subdomains to use networks dedicated to their parent domain(s). Should be used with aclType=Domain, defaulted to allow.subdomain.network.access global config if not specified")
+ + " subdomains to use networks dedicated to their parent domain(s). Should be used with aclType=Domain, defaulted to allow.subdomain.network.access global config if not specified")
private Boolean subdomainAccess;
@Parameter(name = ApiConstants.VPC_ID, type = CommandType.UUID, entityType = VpcResponse.class, description = "the VPC network belongs to")
@@ -129,13 +128,15 @@ public class CreateNetworkCmd extends BaseCmd {
private String endIpv6;
@Parameter(name = ApiConstants.IP6_GATEWAY, type = CommandType.STRING, description = "the gateway of the IPv6 network. Required "
- + "for Shared networks and Isolated networks when it belongs to VPC")
+ + "for Shared networks and Isolated networks when it belongs to VPC")
private String ip6Gateway;
@Parameter(name = ApiConstants.IP6_CIDR, type = CommandType.STRING, description = "the CIDR of IPv6 network, must be at least /64")
private String ip6Cidr;
- @Parameter(name = ApiConstants.DISPLAY_NETWORK, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the network to the end user or not.")
+ @Parameter(name = ApiConstants.DISPLAY_NETWORK,
+ type = CommandType.BOOLEAN,
+ description = "an optional field, whether to the display the network to the end user or not.")
private Boolean displayNetwork;
@Parameter(name = ApiConstants.ACL_ID, type = CommandType.UUID, entityType = NetworkACLResponse.class, description = "Network ACL Id associated for the network")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
index 0fd5864..a48e01b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.network;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.Network;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
index d2081fb..6dd5965 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
@@ -16,8 +16,11 @@
// under the License.
package org.apache.cloudstack.api.command.user.network;
-import com.cloud.network.vpc.NetworkACL;
-import com.cloud.utils.Pair;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -26,10 +29,9 @@ import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.NetworkACLResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.VpcResponse;
-import org.apache.log4j.Logger;
-import java.util.ArrayList;
-import java.util.List;
+import com.cloud.network.vpc.NetworkACL;
+import com.cloud.utils.Pair;
@APICommand(name = "listNetworkACLLists", description = "Lists all network ACLs", responseObject = NetworkACLResponse.class)
public class ListNetworkACLListsCmd extends BaseListCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
index a538439..0aa319a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
@@ -19,15 +19,19 @@ package org.apache.cloudstack.api.command.user.network;
import java.util.ArrayList;
import java.util.List;
-import com.cloud.network.vpc.NetworkACLItem;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.response.*;
-import org.apache.log4j.Logger;
+import org.apache.cloudstack.api.response.FirewallRuleResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.NetworkACLItemResponse;
+import org.apache.cloudstack.api.response.NetworkACLResponse;
+import org.apache.cloudstack.api.response.NetworkResponse;
-import com.cloud.network.rules.FirewallRule;
+import com.cloud.network.vpc.NetworkACLItem;
import com.cloud.utils.Pair;
@APICommand(name = "listNetworkACLs", description = "Lists all network ACL items", responseObject = NetworkACLItemResponse.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
index 622e080..2c2b1e1 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.network;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -27,7 +29,6 @@ import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.NetworkOfferingResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.offering.NetworkOffering;
@@ -89,7 +90,9 @@ public class ListNetworkOfferingsCmd extends BaseListCmd {
description = "true if need to list only netwok offerings where source nat is supported, false otherwise")
private Boolean sourceNatSupported;
- @Parameter(name = ApiConstants.SPECIFY_IP_RANGES, type = CommandType.BOOLEAN, description = "true if need to list only network offerings which support specifying ip ranges")
+ @Parameter(name = ApiConstants.SPECIFY_IP_RANGES,
+ type = CommandType.BOOLEAN,
+ description = "true if need to list only network offerings which support specifying ip ranges")
private Boolean specifyIpRanges;
@Parameter(name = ApiConstants.TAGS, type = CommandType.STRING, description = "list network offerings by tags", length = 4096)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
index 80d7848..fa27a4a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.network;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
@@ -28,7 +30,6 @@ import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
import org.apache.cloudstack.api.response.VpcResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.Network;
@@ -52,16 +53,24 @@ public class ListNetworksCmd extends BaseListTaggedResourcesCmd {
@Parameter(name = ApiConstants.IS_SYSTEM, type = CommandType.BOOLEAN, description = "true if network is system, false otherwise")
private Boolean isSystem;
- @Parameter(name = ApiConstants.ACL_TYPE, type = CommandType.STRING, description = "list networks by ACL (access control list) type. Supported values are Account and Domain")
+ @Parameter(name = ApiConstants.ACL_TYPE,
+ type = CommandType.STRING,
+ description = "list networks by ACL (access control list) type. Supported values are Account and Domain")
private String aclType;
@Parameter(name = ApiConstants.TRAFFIC_TYPE, type = CommandType.STRING, description = "type of the traffic")
private String trafficType;
- @Parameter(name = ApiConstants.PHYSICAL_NETWORK_ID, type = CommandType.UUID, entityType = PhysicalNetworkResponse.class, description = "list networks by physical network id")
+ @Parameter(name = ApiConstants.PHYSICAL_NETWORK_ID,
+ type = CommandType.UUID,
+ entityType = PhysicalNetworkResponse.class,
+ description = "list networks by physical network id")
private Long physicalNetworkId;
- @Parameter(name = ApiConstants.SUPPORTED_SERVICES, type = CommandType.LIST, collectionType = CommandType.STRING, description = "list networks supporting certain services")
+ @Parameter(name = ApiConstants.SUPPORTED_SERVICES,
+ type = CommandType.LIST,
+ collectionType = CommandType.STRING,
+ description = "list networks supporting certain services")
private List<String> supportedServices;
@Parameter(name = ApiConstants.RESTART_REQUIRED, type = CommandType.BOOLEAN, description = "list networks by restartRequired")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java
index dc4cf64..de1f163 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java
@@ -16,21 +16,23 @@
// under the License.
package org.apache.cloudstack.api.command.user.network;
-import com.cloud.event.EventTypes;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.vpc.NetworkACL;
-import com.cloud.network.vpc.Vpc;
-import com.cloud.user.Account;
+import org.apache.log4j.Logger;
-import org.apache.cloudstack.api.*;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.NetworkACLResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.PrivateGatewayResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.user.Account;
@APICommand(name = "replaceNetworkACLList", description = "Replaces ACL associated with a Network or private gateway", responseObject = SuccessResponse.class)
public class ReplaceNetworkACLListCmd extends BaseAsyncCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java
index 8caf076..cd508ff 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.network;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -25,7 +27,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
@@ -106,6 +107,7 @@ public class RestartNetworkCmd extends BaseAsyncCmd {
return id;
}
+ @Override
public String getEventDescription() {
return "Restarting network: " + getNetworkId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
index 2e38e49..1e559c2 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
@@ -16,23 +16,23 @@
// under the License.
package org.apache.cloudstack.api.command.user.network;
-import com.cloud.event.EventTypes;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.vpc.NetworkACLItem;
-import com.cloud.user.Account;
-import com.cloud.utils.net.NetUtils;
+import java.util.List;
+
+import org.apache.log4j.Logger;
-import org.apache.cloudstack.api.*;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.NetworkACLItemResponse;
-import org.apache.cloudstack.api.response.NetworkACLResponse;
-import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.vpc.NetworkACLItem;
+import com.cloud.user.Account;
@APICommand(name = "updateNetworkACLItem", description = "Updates ACL Item with specified Id", responseObject = NetworkACLItemResponse.class)
public class UpdateNetworkACLItemCmd extends BaseAsyncCmd {
@@ -44,10 +44,16 @@ public class UpdateNetworkACLItemCmd extends BaseAsyncCmd {
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = NetworkACLItemResponse.class, required = true, description = "the ID of the network ACL Item")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = NetworkACLItemResponse.class,
+ required = true,
+ description = "the ID of the network ACL Item")
private Long id;
- @Parameter(name = ApiConstants.PROTOCOL, type = CommandType.STRING, description = "the protocol for the ACL rule. Valid values are TCP/UDP/ICMP/ALL or valid protocol number")
+ @Parameter(name = ApiConstants.PROTOCOL,
+ type = CommandType.STRING,
+ description = "the protocol for the ACL rule. Valid values are TCP/UDP/ICMP/ALL or valid protocol number")
private String protocol;
@Parameter(name = ApiConstants.START_PORT, type = CommandType.INTEGER, description = "the starting port of ACL")
@@ -66,7 +72,7 @@ public class UpdateNetworkACLItemCmd extends BaseAsyncCmd {
private Integer icmpCode;
@Parameter(name = ApiConstants.TRAFFIC_TYPE, type = CommandType.STRING, description = "the traffic type for the ACL,"
- + "can be Ingress or Egress, defaulted to Ingress if not specified")
+ + "can be Ingress or Egress, defaulted to Ingress if not specified")
private String trafficType;
@Parameter(name = ApiConstants.NUMBER, type = CommandType.INTEGER, description = "The network of the vm the ACL will be created for")
@@ -157,8 +163,9 @@ public class UpdateNetworkACLItemCmd extends BaseAsyncCmd {
@Override
public void execute() throws ResourceUnavailableException {
CallContext.current().setEventDetails("Rule Id: " + getId());
- NetworkACLItem aclItem = _networkACLService.updateNetworkACLItem(getId(), getProtocol(), getSourceCidrList(), getTrafficType(), getAction(), getNumber(),
- getSourcePortStart(), getSourcePortEnd(), getIcmpCode(), getIcmpType());
+ NetworkACLItem aclItem =
+ _networkACLService.updateNetworkACLItem(getId(), getProtocol(), getSourceCidrList(), getTrafficType(), getAction(), getNumber(), getSourcePortStart(),
+ getSourcePortEnd(), getIcmpCode(), getIcmpType());
if (aclItem == null) {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update network ACL Item");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
index 33e8a3c..2091102 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.network;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.NetworkOfferingResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@@ -67,7 +67,9 @@ public class UpdateNetworkCmd extends BaseAsyncCmd {
@Parameter(name = ApiConstants.GUEST_VM_CIDR, type = CommandType.STRING, description = "CIDR for Guest VMs,Cloudstack allocates IPs to Guest VMs only from this CIDR")
private String guestVmCidr;
- @Parameter(name = ApiConstants.DISPLAY_NETWORK, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the network to the end user or not.")
+ @Parameter(name = ApiConstants.DISPLAY_NETWORK,
+ type = CommandType.BOOLEAN,
+ description = "an optional field, whether to the display the network to the end user or not.")
private Boolean displayNetwork;
/////////////////////////////////////////////////////
@@ -137,8 +139,9 @@ public class UpdateNetworkCmd extends BaseAsyncCmd {
throw new InvalidParameterValueException("Couldn't find network by id");
}
- Network result = _networkService.updateGuestNetwork(getId(), getNetworkName(), getDisplayText(), callerAccount, callerUser, getNetworkDomain(), getNetworkOfferingId(),
- getChangeCidr(), getGuestVmCidr(), getDisplayNetwork());
+ Network result =
+ _networkService.updateGuestNetwork(getId(), getNetworkName(), getDisplayText(), callerAccount, callerUser, getNetworkDomain(), getNetworkOfferingId(),
+ getChangeCidr(), getGuestVmCidr(), getDisplayNetwork());
if (result != null) {
NetworkResponse response = _responseGenerator.createNetworkResponse(result);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java
index 6b9a5e2..954b64e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java
@@ -16,20 +16,15 @@
// under the License.
package org.apache.cloudstack.api.command.user.offering;
-import java.util.ArrayList;
-import java.util.List;
+import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.response.AsyncJobResponse;
import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.log4j.Logger;
-
-import com.cloud.offering.DiskOffering;
@APICommand(name = "listDiskOfferings", description = "Lists all available disk offerings.", responseObject = DiskOfferingResponse.class)
public class ListDiskOfferingsCmd extends BaseListCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
index 4c1f5e6..08c69e8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
@@ -16,10 +16,7 @@
// under the License.
package org.apache.cloudstack.api.command.user.offering;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
@@ -29,9 +26,6 @@ import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.log4j.Logger;
-
-import com.cloud.exception.InvalidParameterValueException;
@APICommand(name = "listServiceOfferings", description = "Lists all available service offerings.", responseObject = ServiceOfferingResponse.class)
public class ListServiceOfferingsCmd extends BaseListCmd {
@@ -55,7 +49,10 @@ public class ListServiceOfferingsCmd extends BaseListCmd {
description = "the ID of the virtual machine. Pass this in if you want to see the available service offering that a virtual machine can be changed to.")
private Long virtualMachineId;
- @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "the ID of the domain associated with the service offering")
+ @Parameter(name = ApiConstants.DOMAIN_ID,
+ type = CommandType.UUID,
+ entityType = DomainResponse.class,
+ description = "the ID of the domain associated with the service offering")
private Long domainId;
@Parameter(name = ApiConstants.IS_SYSTEM_OFFERING, type = CommandType.BOOLEAN, description = "is this a system vm offering")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java
index 75e469d..66c64a6 100644
--- a/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.project;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -25,8 +27,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.projects.Project;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java
index ecd33ac..dcb83a8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.project;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceAllocationException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java
index 1b87ac6..88205e8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.project;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.projects.Project;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java
index ba3fc19..9d4d838 100644
--- a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.project;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.ProjectInvitationResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java
index 41d0975..0e9e7ae 100644
--- a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.project;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListAccountResourcesCmd;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ProjectInvitationResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
-import org.apache.log4j.Logger;
@APICommand(name = "listProjectInvitations",
description = "Lists projects and provides detailed information for listed projects",
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java
index 99d5421..2cf6106 100644
--- a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java
@@ -21,17 +21,21 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListAccountResourcesCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.InvalidParameterValueException;
-@APICommand(name = "listProjects", description = "Lists projects and provides detailed information for listed projects", responseObject = ProjectResponse.class, since = "3.0.0")
+@APICommand(name = "listProjects",
+ description = "Lists projects and provides detailed information for listed projects",
+ responseObject = ProjectResponse.class,
+ since = "3.0.0")
public class ListProjectsCmd extends BaseListAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListProjectsCmd.class.getName());
private static final String s_name = "listprojectsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java
index c1d073a..c2a1885 100644
--- a/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.project;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -25,8 +27,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InvalidParameterValueException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java
index e02ef67..78903bf 100644
--- a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.project;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -25,8 +27,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceAllocationException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java
index 3b8131f..dda7b54 100644
--- a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.project;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
@@ -45,7 +45,9 @@ public class UpdateProjectInvitationCmd extends BaseAsyncCmd {
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "account that is joining the project")
private String accountName;
- @Parameter(name = ApiConstants.TOKEN, type = CommandType.STRING, description = "list invitations for specified account; this parameter has to be specified with domainId")
+ @Parameter(name = ApiConstants.TOKEN,
+ type = CommandType.STRING,
+ description = "list invitations for specified account; this parameter has to be specified with domainId")
private String token;
@Parameter(name = ApiConstants.ACCEPT, type = CommandType.BOOLEAN, description = "if true, accept the invitation, decline if false. True by default")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java
index f4af27f..c369b9c 100644
--- a/api/src/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java
@@ -21,6 +21,8 @@ import java.util.List;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -29,7 +31,6 @@ import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.RegionResponse;
import org.apache.cloudstack.region.Region;
import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
@APICommand(name = "listRegions", description = "Lists Regions", responseObject = RegionResponse.class)
public class ListRegionsCmd extends BaseListCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java
index aedbe4a..1fe73b5 100644
--- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java
@@ -17,6 +17,27 @@
package org.apache.cloudstack.api.command.user.region.ha.gslb;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.FirewallRuleResponse;
+import org.apache.cloudstack.api.response.GlobalLoadBalancerResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.context.CallContext;
+
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.rules.LoadBalancer;
@@ -26,23 +47,6 @@ import com.cloud.user.Account;
import com.cloud.utils.StringUtils;
import com.cloud.utils.db.EntityManager;
-import org.apache.cloudstack.api.*;
-import org.apache.cloudstack.api.response.FirewallRuleResponse;
-import org.apache.cloudstack.api.response.GlobalLoadBalancerResponse;
-import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.cloudstack.context.CallContext;
-
-import org.apache.log4j.Logger;
-
-import javax.inject.Inject;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
@APICommand(name = "assignToGlobalLoadBalancerRule",
description = "Assign load balancer rule or list of load " + "balancer rules to a global load balancer rules.",
responseObject = SuccessResponse.class)
@@ -77,7 +81,7 @@ public class AssignToGlobalLoadBalancerRuleCmd extends BaseAsyncCmd {
@Parameter(name = ApiConstants.GSLB_LBRULE_WEIGHT_MAP,
type = CommandType.MAP,
description = "Map of LB rule id's and corresponding weights (between 1-100) in the GSLB rule, if not specified weight of "
- + "a LB rule is defaulted to 1. Specified as 'gslblbruleweightsmap[0].loadbalancerid=UUID" + "&gslblbruleweightsmap[0].weight=10'",
+ + "a LB rule is defaulted to 1. Specified as 'gslblbruleweightsmap[0].loadbalancerid=UUID" + "&gslblbruleweightsmap[0].weight=10'",
required = false)
private Map gslbLbRuleWieghtMap;
@@ -156,7 +160,8 @@ public class AssignToGlobalLoadBalancerRuleCmd extends BaseAsyncCmd {
@Override
public void execute() {
- CallContext.current().setEventDetails("Global Load balancer rule Id: " + getGlobalLoadBalancerRuleId() + " VmIds: " + StringUtils.join(getLoadBalancerRulesIds(), ","));
+ CallContext.current().setEventDetails(
+ "Global Load balancer rule Id: " + getGlobalLoadBalancerRuleId() + " VmIds: " + StringUtils.join(getLoadBalancerRulesIds(), ","));
boolean result = _gslbService.assignToGlobalLoadBalancerRule(this);
if (result) {
SuccessResponse response = new SuccessResponse(getCommandName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
index d67dd0d..bf2d86f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
@@ -17,21 +17,27 @@
package org.apache.cloudstack.api.command.user.region.ha.gslb;
-import com.cloud.event.EventTypes;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.region.ha.GlobalLoadBalancerRule;
-import com.cloud.region.ha.GlobalLoadBalancingRulesService;
+import javax.inject.Inject;
+
+import org.apache.log4j.Logger;
-import org.apache.cloudstack.api.*;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandJobType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCreateCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.GlobalLoadBalancerResponse;
import org.apache.cloudstack.api.response.RegionResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
-import javax.inject.Inject;
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.region.ha.GlobalLoadBalancerRule;
+import com.cloud.region.ha.GlobalLoadBalancingRulesService;
@APICommand(name = "createGlobalLoadBalancerRule", description = "Creates a global load balancer rule", responseObject = GlobalLoadBalancerResponse.class)
public class CreateGlobalLoadBalancerRuleCmd extends BaseAsyncCreateCmd {
@@ -69,7 +75,7 @@ public class CreateGlobalLoadBalancerRuleCmd extends BaseAsyncCreateCmd {
type = CommandType.STRING,
required = false,
description = "load balancer algorithm (roundrobin, leastconn, proximity) "
- + "that method is used to distribute traffic across the zones participating in global server load balancing, if not specified defaults to 'round robin'")
+ + "that method is used to distribute traffic across the zones participating in global server load balancing, if not specified defaults to 'round robin'")
private String algorithm;
@Parameter(name = ApiConstants.GSLB_STICKY_SESSION_METHOD,
[06/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java b/engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java
index 4e55217..93f969f 100755
--- a/engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java
+++ b/engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java
@@ -61,15 +61,16 @@ public interface OrchestrationService {
@POST
@Path("/createvm")
VirtualMachineEntity createVirtualMachine(@QueryParam("id") String id, @QueryParam("owner") String owner, @QueryParam("template-id") String templateId,
- @QueryParam("host-name") String hostName, @QueryParam("display-name") String displayName, @QueryParam("hypervisor") String hypervisor, @QueryParam("cpu") int cpu,
- @QueryParam("speed") int speed, @QueryParam("ram") long memory, @QueryParam("disk-size") Long diskSize, @QueryParam("compute-tags") List<String> computeTags,
- @QueryParam("root-disk-tags") List<String> rootDiskTags, @QueryParam("network-nic-map") Map<String, NicProfile> networkNicMap,
- @QueryParam("deploymentplan") DeploymentPlan plan, @QueryParam("root-disk-size") Long rootDiskSize) throws InsufficientCapacityException;
+ @QueryParam("host-name") String hostName, @QueryParam("display-name") String displayName, @QueryParam("hypervisor") String hypervisor,
+ @QueryParam("cpu") int cpu, @QueryParam("speed") int speed, @QueryParam("ram") long memory, @QueryParam("disk-size") Long diskSize,
+ @QueryParam("compute-tags") List<String> computeTags, @QueryParam("root-disk-tags") List<String> rootDiskTags,
+ @QueryParam("network-nic-map") Map<String, NicProfile> networkNicMap, @QueryParam("deploymentplan") DeploymentPlan plan,
+ @QueryParam("root-disk-size") Long rootDiskSize) throws InsufficientCapacityException;
@POST
VirtualMachineEntity createVirtualMachineFromScratch(@QueryParam("id") String id, @QueryParam("owner") String owner, @QueryParam("iso-id") String isoId,
- @QueryParam("host-name") String hostName, @QueryParam("display-name") String displayName, @QueryParam("hypervisor") String hypervisor, @QueryParam("os") String os,
- @QueryParam("cpu") int cpu, @QueryParam("speed") int speed, @QueryParam("ram") long memory, @QueryParam("disk-size") Long diskSize,
+ @QueryParam("host-name") String hostName, @QueryParam("display-name") String displayName, @QueryParam("hypervisor") String hypervisor,
+ @QueryParam("os") String os, @QueryParam("cpu") int cpu, @QueryParam("speed") int speed, @QueryParam("ram") long memory, @QueryParam("disk-size") Long diskSize,
@QueryParam("compute-tags") List<String> computeTags, @QueryParam("root-disk-tags") List<String> rootDiskTags,
@QueryParam("network-nic-map") Map<String, NicProfile> networkNicMap, @QueryParam("deploymentplan") DeploymentPlan plan) throws InsufficientCapacityException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreDriver.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreDriver.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreDriver.java
index f73d6aa..3d73721 100644
--- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreDriver.java
+++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreDriver.java
@@ -18,12 +18,13 @@
*/
package org.apache.cloudstack.engine.subsystem.api.storage;
-import com.cloud.agent.api.to.DataStoreTO;
-import com.cloud.agent.api.to.DataTO;
+import java.util.Map;
+
import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
import org.apache.cloudstack.storage.command.CommandResult;
-import java.util.Map;
+import com.cloud.agent.api.to.DataStoreTO;
+import com.cloud.agent.api.to.DataTO;
public interface DataStoreDriver {
Map<String, String> getCapabilities();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProviderManager.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProviderManager.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProviderManager.java
index d25e10e..d643d7f 100644
--- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProviderManager.java
+++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProviderManager.java
@@ -18,8 +18,6 @@
*/
package org.apache.cloudstack.engine.subsystem.api.storage;
-import java.util.List;
-
import com.cloud.storage.DataStoreProviderApiService;
import com.cloud.utils.component.Manager;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java
index 61c9006..b21616a 100644
--- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java
+++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java
@@ -44,6 +44,14 @@ public interface ObjectInDataStoreStateMachine extends StateObject<ObjectInDataS
}
enum Event {
- CreateRequested, CreateOnlyRequested, DestroyRequested, OperationSuccessed, OperationFailed, CopyingRequested, MigrationRequested, ResizeRequested, ExpungeRequested
+ CreateRequested,
+ CreateOnlyRequested,
+ DestroyRequested,
+ OperationSuccessed,
+ OperationFailed,
+ CopyingRequested,
+ MigrationRequested,
+ ResizeRequested,
+ ExpungeRequested
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStore.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStore.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStore.java
index b4d7cb9..465b7eb 100644
--- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStore.java
+++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStore.java
@@ -20,12 +20,6 @@ package org.apache.cloudstack.engine.subsystem.api.storage;
import java.util.List;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
-import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo;
-import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
-import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo;
-import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
import org.apache.cloudstack.engine.subsystem.api.storage.disktype.DiskFormat;
public interface PrimaryDataStore extends DataStore, PrimaryDataStoreInfo {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreInfo.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreInfo.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreInfo.java
index 95a5cc9..19893d0 100644
--- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreInfo.java
+++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreInfo.java
@@ -31,8 +31,10 @@ public interface PrimaryDataStoreInfo extends StoragePool {
boolean isVolumeDiskTypeSupported(DiskFormat diskType);
+ @Override
String getUuid();
+ @Override
StoragePoolType getPoolType();
PrimaryDataStoreLifeCycle getLifeCycle();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateInfo.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateInfo.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateInfo.java
index ceb5fc0..50b0524 100644
--- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateInfo.java
+++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateInfo.java
@@ -21,6 +21,7 @@ package org.apache.cloudstack.engine.subsystem.api.storage;
import com.cloud.template.VirtualMachineTemplate;
public interface TemplateInfo extends DataObject, VirtualMachineTemplate {
+ @Override
String getUniqueName();
String getInstallPath();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/test/org/apache/cloudstack/engine/subsystem/api/storage/ScopeTest.java
----------------------------------------------------------------------
diff --git a/engine/api/test/org/apache/cloudstack/engine/subsystem/api/storage/ScopeTest.java b/engine/api/test/org/apache/cloudstack/engine/subsystem/api/storage/ScopeTest.java
index 473877f..c30cd54 100644
--- a/engine/api/test/org/apache/cloudstack/engine/subsystem/api/storage/ScopeTest.java
+++ b/engine/api/test/org/apache/cloudstack/engine/subsystem/api/storage/ScopeTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.cloudstack.engine.subsystem.api.storage;
-import static org.junit.Assert.*;
import junit.framework.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/components-api/src/com/cloud/agent/AgentManager.java
----------------------------------------------------------------------
diff --git a/engine/components-api/src/com/cloud/agent/AgentManager.java b/engine/components-api/src/com/cloud/agent/AgentManager.java
index a6a6925..e9e3249 100755
--- a/engine/components-api/src/com/cloud/agent/AgentManager.java
+++ b/engine/components-api/src/com/cloud/agent/AgentManager.java
@@ -35,7 +35,8 @@ import com.cloud.resource.ServerResource;
* AgentManager manages hosts. It directly coordinates between the DAOs and the connections it manages.
*/
public interface AgentManager {
- static final ConfigKey<Integer> Wait = new ConfigKey<Integer>("Advanced", Integer.class, "wait", "1800", "Time in seconds to wait for control commands to return", true);
+ static final ConfigKey<Integer> Wait = new ConfigKey<Integer>("Advanced", Integer.class, "wait", "1800", "Time in seconds to wait for control commands to return",
+ true);
public enum TapAgentsAction {
Add, Del, Contains,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/components-api/src/com/cloud/alert/AlertManager.java
----------------------------------------------------------------------
diff --git a/engine/components-api/src/com/cloud/alert/AlertManager.java b/engine/components-api/src/com/cloud/alert/AlertManager.java
index 8b22191..a00f3bb 100755
--- a/engine/components-api/src/com/cloud/alert/AlertManager.java
+++ b/engine/components-api/src/com/cloud/alert/AlertManager.java
@@ -52,13 +52,15 @@ public interface AlertManager extends Manager {
public static final short ALERT_TYPE_RESOURCE_LIMIT_EXCEEDED = 26; // Generated when the resource limit exceeds the limit. Currently used for recurring snapshots only
static final ConfigKey<Double> StorageCapacityThreshold = new ConfigKey<Double>(Double.class, "cluster.storage.capacity.notificationthreshold", "Alert", "0.75",
- "Percentage (as a value between 0 and 1) of storage utilization above which alerts will be sent about low storage available.", true, ConfigKey.Scope.Cluster, null);
+ "Percentage (as a value between 0 and 1) of storage utilization above which alerts will be sent about low storage available.", true, ConfigKey.Scope.Cluster,
+ null);
static final ConfigKey<Double> CPUCapacityThreshold = new ConfigKey<Double>(Double.class, "cluster.cpu.allocated.capacity.notificationthreshold", "Alert", "0.75",
"Percentage (as a value between 0 and 1) of cpu utilization above which alerts will be sent about low cpu available.", true, ConfigKey.Scope.Cluster, null);
- static final ConfigKey<Double> MemoryCapacityThreshold = new ConfigKey<Double>(Double.class, "cluster.memory.allocated.capacity.notificationthreshold", "Alert", "0.75",
- "Percentage (as a value between 0 and 1) of memory utilization above which alerts will be sent about low memory available.", true, ConfigKey.Scope.Cluster, null);
- static final ConfigKey<Double> StorageAllocatedCapacityThreshold = new ConfigKey<Double>(Double.class, "cluster.storage.allocated.capacity.notificationthreshold", "Alert",
- "0.75", "Percentage (as a value between 0 and 1) of allocated storage utilization above which alerts will be sent about low storage available.", true,
+ static final ConfigKey<Double> MemoryCapacityThreshold = new ConfigKey<Double>(Double.class, "cluster.memory.allocated.capacity.notificationthreshold", "Alert",
+ "0.75", "Percentage (as a value between 0 and 1) of memory utilization above which alerts will be sent about low memory available.", true,
+ ConfigKey.Scope.Cluster, null);
+ static final ConfigKey<Double> StorageAllocatedCapacityThreshold = new ConfigKey<Double>(Double.class, "cluster.storage.allocated.capacity.notificationthreshold",
+ "Alert", "0.75", "Percentage (as a value between 0 and 1) of allocated storage utilization above which alerts will be sent about low storage available.", true,
ConfigKey.Scope.Cluster, null);
void clearAlert(short alertType, long dataCenterId, long podId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/components-api/src/com/cloud/capacity/CapacityManager.java
----------------------------------------------------------------------
diff --git a/engine/components-api/src/com/cloud/capacity/CapacityManager.java b/engine/components-api/src/com/cloud/capacity/CapacityManager.java
index 6032261..4332ede 100755
--- a/engine/components-api/src/com/cloud/capacity/CapacityManager.java
+++ b/engine/components-api/src/com/cloud/capacity/CapacityManager.java
@@ -41,12 +41,18 @@ public interface CapacityManager {
static final ConfigKey<Float> MemOverprovisioningFactor = new ConfigKey<Float>(Float.class, MemOverprovisioningFactorCK, "Advanced", "1.0",
"Used for memory overprovisioning calculation", true, ConfigKey.Scope.Cluster, null);
static final ConfigKey<Double> StorageCapacityDisableThreshold = new ConfigKey<Double>("Alert", Double.class, StorageCapacityDisableThresholdCK, "0.85",
- "Percentage (as a value between 0 and 1) of storage utilization above which allocators will disable using the pool for low storage available.", true, ConfigKey.Scope.Zone);
+ "Percentage (as a value between 0 and 1) of storage utilization above which allocators will disable using the pool for low storage available.", true,
+ ConfigKey.Scope.Zone);
static final ConfigKey<Double> StorageOverprovisioningFactor = new ConfigKey<Double>("Storage", Double.class, StorageOverprovisioningFactorCK, "2",
"Used for storage overprovisioning calculation; available storage will be (actualStorageSize * storage.overprovisioning.factor)", true, ConfigKey.Scope.Zone);
- static final ConfigKey<Double> StorageAllocatedCapacityDisableThreshold = new ConfigKey<Double>("Alert", Double.class, StorageAllocatedCapacityDisableThresholdCK, "0.85",
- "Percentage (as a value between 0 and 1) of allocated storage utilization above which allocators will disable using the pool for low allocated storage available.", true,
- ConfigKey.Scope.Zone);
+ static final ConfigKey<Double> StorageAllocatedCapacityDisableThreshold =
+ new ConfigKey<Double>(
+ "Alert",
+ Double.class,
+ StorageAllocatedCapacityDisableThresholdCK,
+ "0.85",
+ "Percentage (as a value between 0 and 1) of allocated storage utilization above which allocators will disable using the pool for low allocated storage available.",
+ true, ConfigKey.Scope.Zone);
public boolean releaseVmCapacity(VirtualMachine vm, boolean moveFromReserved, boolean moveToReservered, Long hostId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/components-api/src/com/cloud/configuration/ConfigurationManager.java
----------------------------------------------------------------------
diff --git a/engine/components-api/src/com/cloud/configuration/ConfigurationManager.java b/engine/components-api/src/com/cloud/configuration/ConfigurationManager.java
index 3c53863..13ca3f9 100755
--- a/engine/components-api/src/com/cloud/configuration/ConfigurationManager.java
+++ b/engine/components-api/src/com/cloud/configuration/ConfigurationManager.java
@@ -39,10 +39,7 @@ import com.cloud.offering.NetworkOffering;
import com.cloud.offering.NetworkOffering.Availability;
import com.cloud.offerings.NetworkOfferingVO;
import com.cloud.org.Grouping.AllocationState;
-import com.cloud.service.ServiceOfferingVO;
-import com.cloud.storage.DiskOfferingVO;
import com.cloud.user.Account;
-import com.cloud.vm.VirtualMachine;
/**
* ConfigurationManager handles adding pods/zones, changing IP ranges, enabling external firewalls, and editing
@@ -137,8 +134,8 @@ public interface ConfigurationManager {
* (true if it is ok to not validate that gateway IP address overlap with Start/End IP of the POD)
* @return Pod
*/
- HostPodVO
- createPod(long userId, String podName, long zoneId, String gateway, String cidr, String startIp, String endIp, String allocationState, boolean skipGatewayOverlapCheck);
+ HostPodVO createPod(long userId, String podName, long zoneId, String gateway, String cidr, String startIp, String endIp, String allocationState,
+ boolean skipGatewayOverlapCheck);
/**
* Creates a new zone
@@ -162,8 +159,9 @@ public interface ConfigurationManager {
* @throws
* @throws
*/
- DataCenterVO createZone(long userId, String zoneName, String dns1, String dns2, String internalDns1, String internalDns2, String guestCidr, String domain, Long domainId,
- NetworkType zoneType, String allocationState, String networkDomain, boolean isSecurityGroupEnabled, boolean isLocalStorageEnabled, String ip6Dns1, String ip6Dns2);
+ DataCenterVO createZone(long userId, String zoneName, String dns1, String dns2, String internalDns1, String internalDns2, String guestCidr, String domain,
+ Long domainId, NetworkType zoneType, String allocationState, String networkDomain, boolean isSecurityGroupEnabled, boolean isLocalStorageEnabled, String ip6Dns1,
+ String ip6Dns2);
/**
* Deletes a VLAN from the database, along with all of its IP addresses. Will not delete VLANs that have allocated
@@ -214,9 +212,9 @@ public interface ConfigurationManager {
boolean conserveMode, Map<Service, Map<Capability, String>> serviceCapabilityMap, boolean specifyIpRanges, boolean isPersistent,
Map<NetworkOffering.Detail, String> details, boolean egressDefaultPolicy, Integer maxconn, boolean enableKeepAlive);
- Vlan createVlanAndPublicIpRange(long zoneId, long networkId, long physicalNetworkId, boolean forVirtualNetwork, Long podId, String startIP, String endIP, String vlanGateway,
- String vlanNetmask, String vlanId, Account vlanOwner, String startIPv6, String endIPv6, String vlanIp6Gateway, String vlanIp6Cidr) throws InsufficientCapacityException,
- ConcurrentOperationException, InvalidParameterValueException;
+ Vlan createVlanAndPublicIpRange(long zoneId, long networkId, long physicalNetworkId, boolean forVirtualNetwork, Long podId, String startIP, String endIP,
+ String vlanGateway, String vlanNetmask, String vlanId, Account vlanOwner, String startIPv6, String endIPv6, String vlanIp6Gateway, String vlanIp6Cidr)
+ throws InsufficientCapacityException, ConcurrentOperationException, InvalidParameterValueException;
void createDefaultSystemNetworks(long zoneId) throws ConcurrentOperationException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/components-api/src/com/cloud/event/UsageEventUtils.java
----------------------------------------------------------------------
diff --git a/engine/components-api/src/com/cloud/event/UsageEventUtils.java b/engine/components-api/src/com/cloud/event/UsageEventUtils.java
index 2b7cf3c..e71afb0 100644
--- a/engine/components-api/src/com/cloud/event/UsageEventUtils.java
+++ b/engine/components-api/src/com/cloud/event/UsageEventUtils.java
@@ -25,7 +25,6 @@ import java.util.Map;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import com.cloud.event.dao.UsageEventDetailsDao;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -39,8 +38,6 @@ import com.cloud.event.dao.UsageEventDao;
import com.cloud.user.Account;
import com.cloud.user.dao.AccountDao;
import com.cloud.utils.component.ComponentContext;
-import org.springframework.beans.factory.annotation.Autowire;
-import org.springframework.beans.factory.annotation.Autowired;
public class UsageEventUtils {
@@ -67,14 +64,14 @@ public class UsageEventUtils {
_dcDao = dcDao;
}
- public static void publishUsageEvent(String usageType, long accountId, long zoneId, long resourceId, String resourceName, Long offeringId, Long templateId, Long size,
- String entityType, String entityUUID) {
+ public static void publishUsageEvent(String usageType, long accountId, long zoneId, long resourceId, String resourceName, Long offeringId, Long templateId,
+ Long size, String entityType, String entityUUID) {
saveUsageEvent(usageType, accountId, zoneId, resourceId, resourceName, offeringId, templateId, size);
publishUsageEvent(usageType, accountId, zoneId, entityType, entityUUID);
}
- public static void publishUsageEvent(String usageType, long accountId, long zoneId, long resourceId, String resourceName, Long offeringId, Long templateId, Long size,
- Long virtualSize, String entityType, String entityUUID) {
+ public static void publishUsageEvent(String usageType, long accountId, long zoneId, long resourceId, String resourceName, Long offeringId, Long templateId,
+ Long size, Long virtualSize, String entityType, String entityUUID) {
saveUsageEvent(usageType, accountId, zoneId, resourceId, resourceName, offeringId, templateId, size, virtualSize);
publishUsageEvent(usageType, accountId, zoneId, entityType, entityUUID);
}
@@ -107,8 +104,8 @@ public class UsageEventUtils {
publishUsageEvent(usageType, accountId, zoneId, entityType, entityUUID);
}
- private static void saveUsageEvent(String usageType, long accountId, long zoneId, long resourceId, String resourceName, Long offeringId, Long templateId, String resourceType,
- Map<String, String> details) {
+ private static void saveUsageEvent(String usageType, long accountId, long zoneId, long resourceId, String resourceName, Long offeringId, Long templateId,
+ String resourceType, Map<String, String> details) {
UsageEventVO usageEvent = new UsageEventVO(usageType, accountId, zoneId, resourceId, resourceName, offeringId, templateId, resourceType);
_usageEventDao.persist(usageEvent);
_usageEventDao.saveDetails(usageEvent.getId(), details);
@@ -127,11 +124,13 @@ public class UsageEventUtils {
_usageEventDao.persist(new UsageEventVO(usageType, accountId, zoneId, resourceId, resourceName));
}
- public static void saveUsageEvent(String usageType, long accountId, long zoneId, long ipAddressId, String ipAddress, boolean isSourceNat, String guestType, boolean isSystem) {
+ public static void saveUsageEvent(String usageType, long accountId, long zoneId, long ipAddressId, String ipAddress, boolean isSourceNat, String guestType,
+ boolean isSystem) {
_usageEventDao.persist(new UsageEventVO(usageType, accountId, zoneId, ipAddressId, ipAddress, isSourceNat, guestType, isSystem));
}
- public static void saveUsageEvent(String usageType, long accountId, long zoneId, long resourceId, String resourceName, Long offeringId, Long templateId, String resourceType) {
+ public static void saveUsageEvent(String usageType, long accountId, long zoneId, long resourceId, String resourceName, Long offeringId, Long templateId,
+ String resourceType) {
_usageEventDao.persist(new UsageEventVO(usageType, accountId, zoneId, resourceId, resourceName, offeringId, templateId, resourceType));
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/components-api/src/com/cloud/network/IpAddressManager.java
----------------------------------------------------------------------
diff --git a/engine/components-api/src/com/cloud/network/IpAddressManager.java b/engine/components-api/src/com/cloud/network/IpAddressManager.java
index 24ece34..e7061f9 100644
--- a/engine/components-api/src/com/cloud/network/IpAddressManager.java
+++ b/engine/components-api/src/com/cloud/network/IpAddressManager.java
@@ -40,8 +40,8 @@ import com.cloud.vm.VirtualMachineProfile;
public interface IpAddressManager {
static final String UseSystemPublicIpsCK = "use.system.public.ips";
static final ConfigKey<Boolean> UseSystemPublicIps = new ConfigKey<Boolean>("Advanced", Boolean.class, UseSystemPublicIpsCK, "true",
- "If true, when account has dedicated public ip range(s), once the ips dedicated to the account have been consumed ips will be acquired from the system pool", true,
- ConfigKey.Scope.Account);
+ "If true, when account has dedicated public ip range(s), once the ips dedicated to the account have been consumed ips will be acquired from the system pool",
+ true, ConfigKey.Scope.Account);
/**
* Assigns a new public ip address.
@@ -73,7 +73,8 @@ public interface IpAddressManager {
*/
boolean disassociatePublicIpAddress(long id, long userId, Account caller);
- boolean applyRules(List<? extends FirewallRule> rules, FirewallRule.Purpose purpose, NetworkRuleApplier applier, boolean continueOnError) throws ResourceUnavailableException;
+ boolean applyRules(List<? extends FirewallRule> rules, FirewallRule.Purpose purpose, NetworkRuleApplier applier, boolean continueOnError)
+ throws ResourceUnavailableException;
/**
* @throws ResourceAllocationException TODO
@@ -93,7 +94,8 @@ public interface IpAddressManager {
boolean applyIpAssociations(Network network, boolean continueOnError) throws ResourceUnavailableException;
- boolean applyIpAssociations(Network network, boolean rulesRevoked, boolean continueOnError, List<? extends PublicIpAddress> publicIps) throws ResourceUnavailableException;
+ boolean applyIpAssociations(Network network, boolean rulesRevoked, boolean continueOnError, List<? extends PublicIpAddress> publicIps)
+ throws ResourceUnavailableException;
IPAddressVO markIpAsUnavailable(long addrId);
@@ -125,13 +127,13 @@ public interface IpAddressManager {
IPAddressVO associateIPToGuestNetwork(long ipAddrId, long networkId, boolean releaseOnFailure) throws ResourceAllocationException, ResourceUnavailableException,
InsufficientAddressCapacityException, ConcurrentOperationException;
- IpAddress allocatePortableIp(Account ipOwner, Account caller, long dcId, Long networkId, Long vpcID) throws ConcurrentOperationException, ResourceAllocationException,
- InsufficientAddressCapacityException;
+ IpAddress allocatePortableIp(Account ipOwner, Account caller, long dcId, Long networkId, Long vpcID) throws ConcurrentOperationException,
+ ResourceAllocationException, InsufficientAddressCapacityException;
boolean releasePortableIpAddress(long addrId);
- IPAddressVO associatePortableIPToGuestNetwork(long ipAddrId, long networkId, boolean releaseOnFailure) throws ResourceAllocationException, ResourceUnavailableException,
- InsufficientAddressCapacityException, ConcurrentOperationException;
+ IPAddressVO associatePortableIPToGuestNetwork(long ipAddrId, long networkId, boolean releaseOnFailure) throws ResourceAllocationException,
+ ResourceUnavailableException, InsufficientAddressCapacityException, ConcurrentOperationException;
IPAddressVO disassociatePortableIPToGuestNetwork(long ipAddrId, long networkId) throws ResourceAllocationException, ResourceUnavailableException,
InsufficientAddressCapacityException, ConcurrentOperationException;
@@ -159,11 +161,11 @@ public interface IpAddressManager {
PublicIp assignDedicateIpAddress(Account owner, Long guestNtwkId, Long vpcId, long dcId, boolean isSourceNat) throws ConcurrentOperationException,
InsufficientAddressCapacityException;
- IpAddress allocateIp(Account ipOwner, boolean isSystem, Account caller, long callerId, DataCenter zone) throws ConcurrentOperationException, ResourceAllocationException,
- InsufficientAddressCapacityException;
+ IpAddress allocateIp(Account ipOwner, boolean isSystem, Account caller, long callerId, DataCenter zone) throws ConcurrentOperationException,
+ ResourceAllocationException, InsufficientAddressCapacityException;
- PublicIp assignPublicIpAddressFromVlans(long dcId, Long podId, Account owner, VlanType type, List<Long> vlanDbIds, Long networkId, String requestedIp, boolean isSystem)
- throws InsufficientAddressCapacityException;
+ PublicIp assignPublicIpAddressFromVlans(long dcId, Long podId, Account owner, VlanType type, List<Long> vlanDbIds, Long networkId, String requestedIp,
+ boolean isSystem) throws InsufficientAddressCapacityException;
int getRuleCountForIp(Long addressId, FirewallRule.Purpose purpose, FirewallRule.State state);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/components-api/src/com/cloud/network/NetworkStateListener.java
----------------------------------------------------------------------
diff --git a/engine/components-api/src/com/cloud/network/NetworkStateListener.java b/engine/components-api/src/com/cloud/network/NetworkStateListener.java
index 4f02dc2..1219061 100644
--- a/engine/components-api/src/com/cloud/network/NetworkStateListener.java
+++ b/engine/components-api/src/com/cloud/network/NetworkStateListener.java
@@ -75,8 +75,8 @@ public class NetworkStateListener implements StateListener<State, Event, Network
}
String resourceName = getEntityFromClassName(Network.class.getName());
- org.apache.cloudstack.framework.events.Event eventMsg = new org.apache.cloudstack.framework.events.Event("management-server",
- EventCategory.RESOURCE_STATE_CHANGE_EVENT.getName(), event, resourceName, vo.getUuid());
+ org.apache.cloudstack.framework.events.Event eventMsg =
+ new org.apache.cloudstack.framework.events.Event("management-server", EventCategory.RESOURCE_STATE_CHANGE_EVENT.getName(), event, resourceName, vo.getUuid());
Map<String, String> eventDescription = new HashMap<String, String>();
eventDescription.put("resource", resourceName);
eventDescription.put("id", vo.getUuid());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/components-api/src/com/cloud/network/lb/LoadBalancingRulesManager.java
----------------------------------------------------------------------
diff --git a/engine/components-api/src/com/cloud/network/lb/LoadBalancingRulesManager.java b/engine/components-api/src/com/cloud/network/lb/LoadBalancingRulesManager.java
index 05eb779..6b3ae02 100644
--- a/engine/components-api/src/com/cloud/network/lb/LoadBalancingRulesManager.java
+++ b/engine/components-api/src/com/cloud/network/lb/LoadBalancingRulesManager.java
@@ -24,8 +24,8 @@ import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.lb.LoadBalancingRule.LbDestination;
import com.cloud.network.lb.LoadBalancingRule.LbHealthCheckPolicy;
-import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy;
import com.cloud.network.lb.LoadBalancingRule.LbSslCert;
+import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy;
import com.cloud.network.rules.LbStickinessMethod;
import com.cloud.network.rules.LoadBalancer;
import com.cloud.network.rules.LoadBalancerContainer.Scheme;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/components-api/src/com/cloud/network/rules/FirewallManager.java
----------------------------------------------------------------------
diff --git a/engine/components-api/src/com/cloud/network/rules/FirewallManager.java b/engine/components-api/src/com/cloud/network/rules/FirewallManager.java
index 0f6d0ce..6085b4b 100644
--- a/engine/components-api/src/com/cloud/network/rules/FirewallManager.java
+++ b/engine/components-api/src/com/cloud/network/rules/FirewallManager.java
@@ -44,8 +44,8 @@ public interface FirewallManager extends FirewallService {
*/
void detectRulesConflict(FirewallRule newRule) throws NetworkRuleConflictException;
- void validateFirewallRule(Account caller, IPAddressVO ipAddress, Integer portStart, Integer portEnd, String proto, Purpose purpose, FirewallRuleType type, Long networkid,
- FirewallRule.TrafficType trafficType);
+ void validateFirewallRule(Account caller, IPAddressVO ipAddress, Integer portStart, Integer portEnd, String proto, Purpose purpose, FirewallRuleType type,
+ Long networkid, FirewallRule.TrafficType trafficType);
boolean applyRules(List<? extends FirewallRule> rules, boolean continueOnError, boolean updateRulesInDB) throws ResourceUnavailableException;
@@ -72,8 +72,8 @@ public interface FirewallManager extends FirewallService {
// FirewallRule.FirewallRuleType type, Long networkId, FirewallRule.TrafficType traffictype)
// throws NetworkRuleConflictException;
- FirewallRule createRuleForAllCidrs(long ipAddrId, Account caller, Integer startPort, Integer endPort, String protocol, Integer icmpCode, Integer icmpType, Long relatedRuleId,
- long networkId) throws NetworkRuleConflictException;
+ FirewallRule createRuleForAllCidrs(long ipAddrId, Account caller, Integer startPort, Integer endPort, String protocol, Integer icmpCode, Integer icmpType,
+ Long relatedRuleId, long networkId) throws NetworkRuleConflictException;
boolean revokeAllFirewallRulesForNetwork(long networkId, long userId, Account caller) throws ResourceUnavailableException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/components-api/src/com/cloud/network/vpc/NetworkACLManager.java
----------------------------------------------------------------------
diff --git a/engine/components-api/src/com/cloud/network/vpc/NetworkACLManager.java b/engine/components-api/src/com/cloud/network/vpc/NetworkACLManager.java
index 25dff52..06952fc 100644
--- a/engine/components-api/src/com/cloud/network/vpc/NetworkACLManager.java
+++ b/engine/components-api/src/com/cloud/network/vpc/NetworkACLManager.java
@@ -16,11 +16,10 @@
// under the License.
package com.cloud.network.vpc;
+import java.util.List;
+
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.dao.NetworkVO;
-import com.cloud.user.Account;
-
-import java.util.List;
public interface NetworkACLManager {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/components-api/src/com/cloud/network/vpc/VpcManager.java
----------------------------------------------------------------------
diff --git a/engine/components-api/src/com/cloud/network/vpc/VpcManager.java b/engine/components-api/src/com/cloud/network/vpc/VpcManager.java
index 98bd8e6..ebfa90a 100644
--- a/engine/components-api/src/com/cloud/network/vpc/VpcManager.java
+++ b/engine/components-api/src/com/cloud/network/vpc/VpcManager.java
@@ -106,8 +106,10 @@ public interface VpcManager {
* @throws InsufficientCapacityException
* @throws ResourceAllocationException
*/
- Network createVpcGuestNetwork(long ntwkOffId, String name, String displayText, String gateway, String cidr, String vlanId, String networkDomain, Account owner, Long domainId,
- PhysicalNetwork pNtwk, long zoneId, ACLType aclType, Boolean subdomainAccess, long vpcId, Long aclId, Account caller, Boolean displayNetworkEnabled)
+ Network
+ createVpcGuestNetwork(long ntwkOffId, String name, String displayText, String gateway, String cidr, String vlanId, String networkDomain, Account owner,
+ Long domainId, PhysicalNetwork pNtwk, long zoneId, ACLType aclType, Boolean subdomainAccess, long vpcId, Long aclId, Account caller,
+ Boolean displayNetworkEnabled)
throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException;
@@ -159,7 +161,8 @@ public interface VpcManager {
* @param gateway
* @param networkOwner TODO
*/
- void validateNtwkOffForNtwkInVpc(Long networkId, long newNtwkOffId, String newCidr, String newNetworkDomain, Vpc vpc, String gateway, Account networkOwner, Long aclId);
+ void
+ validateNtwkOffForNtwkInVpc(Long networkId, long newNtwkOffId, String newCidr, String newNetworkDomain, Vpc vpc, String gateway, Account networkOwner, Long aclId);
List<PrivateGateway> getVpcPrivateGateways(long vpcId);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/components-api/src/com/cloud/resource/ResourceStateAdapter.java
----------------------------------------------------------------------
diff --git a/engine/components-api/src/com/cloud/resource/ResourceStateAdapter.java b/engine/components-api/src/com/cloud/resource/ResourceStateAdapter.java
index 3704adf..b0ca283 100755
--- a/engine/components-api/src/com/cloud/resource/ResourceStateAdapter.java
+++ b/engine/components-api/src/com/cloud/resource/ResourceStateAdapter.java
@@ -19,9 +19,7 @@ package com.cloud.resource;
import java.util.List;
import java.util.Map;
-import com.cloud.agent.api.StartupAnswer;
import com.cloud.agent.api.StartupCommand;
-import com.cloud.exception.ConnectionException;
import com.cloud.host.HostVO;
import com.cloud.utils.component.Adapter;
@@ -55,7 +53,8 @@ public interface ResourceStateAdapter extends Adapter {
public HostVO createHostVOForConnectedAgent(HostVO host, StartupCommand[] cmd);
- public HostVO createHostVOForDirectConnectAgent(HostVO host, final StartupCommand[] startup, ServerResource resource, Map<String, String> details, List<String> hostTags);
+ public HostVO createHostVOForDirectConnectAgent(HostVO host, final StartupCommand[] startup, ServerResource resource, Map<String, String> details,
+ List<String> hostTags);
public DeleteHostAnswer deleteHost(HostVO host, boolean isForced, boolean isForceDeleteStorage) throws UnableDeleteHostException;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java b/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java
index ef7935a..3c31301 100755
--- a/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java
@@ -32,9 +32,10 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+
import com.cloud.agent.Listener;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.CheckHealthCommand;
@@ -112,9 +113,9 @@ public abstract class AgentAttache {
protected AgentManagerImpl _agentMgr;
public final static String[] s_commandsAllowedInMaintenanceMode = new String[] {MaintainCommand.class.toString(), MigrateCommand.class.toString(),
- StopCommand.class.toString(), CheckVirtualMachineCommand.class.toString(), PingTestCommand.class.toString(), CheckHealthCommand.class.toString(),
- ReadyCommand.class.toString(), ShutdownCommand.class.toString(), SetupCommand.class.toString(), ClusterSyncCommand.class.toString(),
- CleanupNetworkRulesCmd.class.toString(), CheckNetworkCommand.class.toString(), PvlanSetupCommand.class.toString()};
+ StopCommand.class.toString(), CheckVirtualMachineCommand.class.toString(), PingTestCommand.class.toString(), CheckHealthCommand.class.toString(),
+ ReadyCommand.class.toString(), ShutdownCommand.class.toString(), SetupCommand.class.toString(), ClusterSyncCommand.class.toString(),
+ CleanupNetworkRulesCmd.class.toString(), CheckNetworkCommand.class.toString(), PvlanSetupCommand.class.toString()};
protected final static String[] s_commandsNotAllowedInConnectingMode = new String[] {StartCommand.class.toString(), CreateCommand.class.toString()};
static {
Arrays.sort(s_commandsAllowedInMaintenanceMode);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
index cf85047..1e8b148 100755
--- a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -38,12 +38,13 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.framework.config.ConfigKey;
import org.apache.cloudstack.framework.config.Configurable;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.cloudstack.utils.identity.ManagementServerNode;
-import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
import com.cloud.agent.Listener;
@@ -97,9 +98,8 @@ import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.EntityManager;
import com.cloud.utils.db.QueryBuilder;
-import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.db.SearchCriteria.Op;
-import com.cloud.utils.db.Transaction;
+import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.exception.HypervisorVersionChangedException;
import com.cloud.utils.fsm.NoTransitionException;
@@ -166,8 +166,8 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
@Inject
ResourceManager _resourceMgr;
- protected final ConfigKey<Integer> Workers = new ConfigKey<Integer>(Integer.class, "workers", "Advanced", "5", "Number of worker threads handling remote agent connections.",
- false);
+ protected final ConfigKey<Integer> Workers = new ConfigKey<Integer>(Integer.class, "workers", "Advanced", "5",
+ "Number of worker threads handling remote agent connections.", false);
protected final ConfigKey<Integer> Port = new ConfigKey<Integer>(Integer.class, "port", "Advanced", "8250", "Port to listen on for remote agent connections.", false);
protected final ConfigKey<Integer> PingInterval = new ConfigKey<Integer>(Integer.class, "ping.interval", "Advanced", "60",
"Interval to send application level pings to make sure the connection is still working", false);
@@ -177,8 +177,8 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
"Seconds to wait before alerting on a disconnected agent", true);
protected final ConfigKey<Integer> DirectAgentLoadSize = new ConfigKey<Integer>(Integer.class, "direct.agent.load.size", "Advanced", "16",
"The number of direct agents to load each time", false);
- protected final ConfigKey<Integer> DirectAgentPoolSize = new ConfigKey<Integer>(Integer.class, "direct.agent.pool.size", "Advanced", "500", "Default size for DirectAgentPool",
- false);
+ protected final ConfigKey<Integer> DirectAgentPoolSize = new ConfigKey<Integer>(Integer.class, "direct.agent.pool.size", "Advanced", "500",
+ "Default size for DirectAgentPool", false);
protected final ConfigKey<Float> DirectAgentThreadCap = new ConfigKey<Float>(Float.class, "direct.agent.thread.cap", "Advanced", "0.1",
"Percentage (as a value between 0 and 1) of direct.agent.pool.size to be used as upper thread cap for a single direct agent to process requests", false);
@@ -494,13 +494,13 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
if (e instanceof ConnectionException) {
ConnectionException ce = (ConnectionException)e;
if (ce.isSetupError()) {
- s_logger.warn("Monitor " + monitor.second().getClass().getSimpleName() + " says there is an error in the connect process for " + hostId + " due to " +
- e.getMessage());
+ s_logger.warn("Monitor " + monitor.second().getClass().getSimpleName() + " says there is an error in the connect process for " + hostId +
+ " due to " + e.getMessage());
handleDisconnectWithoutInvestigation(attache, Event.AgentDisconnected, true, true);
throw ce;
} else {
- s_logger.info("Monitor " + monitor.second().getClass().getSimpleName() + " says not to continue the connect process for " + hostId + " due to " +
- e.getMessage());
+ s_logger.info("Monitor " + monitor.second().getClass().getSimpleName() + " says not to continue the connect process for " + hostId +
+ " due to " + e.getMessage());
handleDisconnectWithoutInvestigation(attache, Event.ShutdownRequested, true, true);
return attache;
}
@@ -508,9 +508,8 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
handleDisconnectWithoutInvestigation(attache, Event.ShutdownRequested, true, true);
throw new CloudRuntimeException("Unable to connect " + attache.getId(), e);
} else {
- s_logger.error(
- "Monitor " + monitor.second().getClass().getSimpleName() + " says there is an error in the connect process for " + hostId + " due to " + e.getMessage(),
- e);
+ s_logger.error("Monitor " + monitor.second().getClass().getSimpleName() + " says there is an error in the connect process for " + hostId +
+ " due to " + e.getMessage(), e);
handleDisconnectWithoutInvestigation(attache, Event.AgentDisconnected, true, true);
throw new CloudRuntimeException("Unable to connect " + attache.getId(), e);
}
@@ -1071,6 +1070,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
_request = request;
}
+ @Override
protected void runInContext() {
_request.logD("Processing the first command ");
StartupCommand[] startups = new StartupCommand[_cmds.length];
@@ -1170,7 +1170,8 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
} else if (cmd instanceof ShutdownCommand) {
final ShutdownCommand shutdown = (ShutdownCommand)cmd;
final String reason = shutdown.getReason();
- s_logger.info("Host " + attache.getId() + " has informed us that it is shutting down with reason " + reason + " and detail " + shutdown.getDetail());
+ s_logger.info("Host " + attache.getId() + " has informed us that it is shutting down with reason " + reason + " and detail " +
+ shutdown.getDetail());
if (reason.equals(ShutdownCommand.Update)) {
//disconnectWithoutInvestigation(attache, Event.UpdateNeeded);
throw new CloudRuntimeException("Agent update not implemented");
@@ -1197,17 +1198,18 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
// gateway (cannot ping the default route)
DataCenterVO dcVO = _dcDao.findById(host.getDataCenterId());
HostPodVO podVO = _podDao.findById(host.getPodId());
- String hostDesc = "name: " + host.getName() + " (id:" + host.getId() + "), availability zone: " + dcVO.getName() + ", pod: " +
- podVO.getName();
+ String hostDesc =
+ "name: " + host.getName() + " (id:" + host.getId() + "), availability zone: " + dcVO.getName() + ", pod: " + podVO.getName();
- _alertMgr.sendAlert(AlertManager.ALERT_TYPE_ROUTING, host.getDataCenterId(), host.getPodId(), "Host lost connection to gateway, " +
- hostDesc, "Host [" + hostDesc +
- "] lost connection to gateway (default route) and is possibly having network connection issues.");
+ _alertMgr.sendAlert(AlertManager.ALERT_TYPE_ROUTING, host.getDataCenterId(), host.getPodId(),
+ "Host lost connection to gateway, " + hostDesc, "Host [" + hostDesc +
+ "] lost connection to gateway (default route) and is possibly having network connection issues.");
} else {
_alertMgr.clearAlert(AlertManager.ALERT_TYPE_ROUTING, host.getDataCenterId(), host.getPodId());
}
} else {
- s_logger.debug("Not processing " + PingRoutingCommand.class.getSimpleName() + " for agent id=" + cmdHostId + "; can't find the host in the DB");
+ s_logger.debug("Not processing " + PingRoutingCommand.class.getSimpleName() + " for agent id=" + cmdHostId +
+ "; can't find the host in the DB");
}
}
answer = new PingAnswer((PingCommand)cmd);
@@ -1330,9 +1332,10 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
try {
return _statusStateMachine.transitTo(host, e, host.getId(), _hostDao);
} catch (NoTransitionException e1) {
- status_logger.debug("Cannot transit agent status with event " + e + " for host " + host.getId() + ", name=" + host.getName() + ", mangement server id is " + msId);
+ status_logger.debug("Cannot transit agent status with event " + e + " for host " + host.getId() + ", name=" + host.getName() +
+ ", mangement server id is " + msId);
throw new CloudRuntimeException("Cannot transit agent status with event " + e + " for host " + host.getId() + ", mangement server id is " + msId + "," +
- e1.getMessage());
+ e1.getMessage());
}
} finally {
_agentStatusLock.unlock();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentAttache.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentAttache.java b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentAttache.java
index 6896132..23c3f76 100755
--- a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentAttache.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentAttache.java
@@ -20,16 +20,13 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.ClosedChannelException;
import java.nio.channels.SocketChannel;
-import java.util.Arrays;
import java.util.Collections;
-import java.util.Iterator;
import java.util.LinkedList;
import javax.net.ssl.SSLEngine;
import org.apache.log4j.Logger;
-import com.cloud.agent.AgentManager;
import com.cloud.agent.Listener;
import com.cloud.agent.api.Command;
import com.cloud.agent.transport.Request;
@@ -71,6 +68,7 @@ public class ClusteredAgentAttache extends ConnectedAgentAttache implements Rout
return _forward;
}
+ @Override
protected void checkAvailability(final Command[] cmds) throws AgentUnavailableException {
if (_transferMode) {
@@ -250,6 +248,7 @@ public class ClusteredAgentAttache extends ConnectedAgentAttache implements Rout
_transferRequests.clear();
}
+ @Override
public void cleanup(final Status state) {
super.cleanup(state);
_transferRequests.clear();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
index 93bf5ea..a73d5a5 100755
--- a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
@@ -43,13 +43,16 @@ import javax.naming.ConfigurationException;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
+import org.apache.log4j.Logger;
+
+import com.google.gson.Gson;
+
import org.apache.cloudstack.framework.config.ConfigDepot;
import org.apache.cloudstack.framework.config.ConfigKey;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.cloudstack.managed.context.ManagedContextTimerTask;
import org.apache.cloudstack.utils.identity.ManagementServerNode;
-import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer;
@@ -85,12 +88,11 @@ import com.cloud.serializer.GsonHelper;
import com.cloud.utils.DateUtil;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.QueryBuilder;
-import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.db.SearchCriteria.Op;
+import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.nio.Link;
import com.cloud.utils.nio.Task;
-import com.google.gson.Gson;
@Local(value = {AgentManager.class, ClusteredAgentRebalanceService.class})
public class ClusteredAgentManagerImpl extends AgentManagerImpl implements ClusterManagerListener, ClusteredAgentRebalanceService {
@@ -130,8 +132,8 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
"Enable agent load balancing between management server nodes", true);
protected final ConfigKey<Double> ConnectedAgentThreshold = new ConfigKey<Double>(Double.class, "agent.load.threshold", "Advanced", "0.7",
"What percentage of the agents can be held by one management server before load balancing happens", true);
- protected final ConfigKey<Integer> LoadSize = new ConfigKey<Integer>(Integer.class, "direct.agent.load.size", "Advanced", "16", "How many agents to connect to in each round",
- true);
+ protected final ConfigKey<Integer> LoadSize = new ConfigKey<Integer>(Integer.class, "direct.agent.load.size", "Advanced", "16",
+ "How many agents to connect to in each round", true);
protected final ConfigKey<Integer> ScanInterval = new ConfigKey<Integer>(Integer.class, "direct.agent.scan.interval", "Advanced", "90",
"Interval between scans to load agents", false, ConfigKey.Scope.Global, 1000);
@@ -332,7 +334,8 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
HostTransferMapVO transferVO = _hostTransferDao.findById(hostId);
if (transferVO != null) {
if (transferVO.getFutureOwner() == _nodeId && transferVO.getState() == HostTransferState.TransferStarted) {
- s_logger.debug("Not processing " + Event.AgentDisconnected + " event for the host id=" + hostId + " as the host is being connected to " + _nodeId);
+ s_logger.debug("Not processing " + Event.AgentDisconnected + " event for the host id=" + hostId + " as the host is being connected to " +
+ _nodeId);
return true;
}
}
@@ -342,7 +345,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
//but the host has already reconnected to the current management server
if (!attache.forForward()) {
s_logger.debug("Not processing " + Event.AgentDisconnected + " event for the host id=" + hostId +
- " as the host is directly connected to the current management server " + _nodeId);
+ " as the host is directly connected to the current management server " + _nodeId);
return true;
}
@@ -388,17 +391,17 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
protected static void logT(byte[] bytes, final String msg) {
s_logger.trace("Seq " + Request.getAgentId(bytes) + "-" + Request.getSequence(bytes) + ": MgmtId " + Request.getManagementServerId(bytes) + ": " +
- (Request.isRequest(bytes) ? "Req: " : "Resp: ") + msg);
+ (Request.isRequest(bytes) ? "Req: " : "Resp: ") + msg);
}
protected static void logD(byte[] bytes, final String msg) {
s_logger.debug("Seq " + Request.getAgentId(bytes) + "-" + Request.getSequence(bytes) + ": MgmtId " + Request.getManagementServerId(bytes) + ": " +
- (Request.isRequest(bytes) ? "Req: " : "Resp: ") + msg);
+ (Request.isRequest(bytes) ? "Req: " : "Resp: ") + msg);
}
protected static void logI(byte[] bytes, final String msg) {
s_logger.info("Seq " + Request.getAgentId(bytes) + "-" + Request.getSequence(bytes) + ": MgmtId " + Request.getManagementServerId(bytes) + ": " +
- (Request.isRequest(bytes) ? "Req: " : "Resp: ") + msg);
+ (Request.isRequest(bytes) ? "Req: " : "Resp: ") + msg);
}
public boolean routeToPeer(String peer, byte[] bytes) {
@@ -723,7 +726,8 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
}
@Override
- public boolean executeRebalanceRequest(long agentId, long currentOwnerId, long futureOwnerId, Event event) throws AgentUnavailableException, OperationTimedoutException {
+ public boolean executeRebalanceRequest(long agentId, long currentOwnerId, long futureOwnerId, Event event) throws AgentUnavailableException,
+ OperationTimedoutException {
boolean result = false;
if (event == Event.RequestAgentRebalance) {
return setToWaitForRebalance(agentId, currentOwnerId, futureOwnerId);
@@ -790,7 +794,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
} else {
if (s_logger.isDebugEnabled()) {
s_logger.debug("There are no hosts to rebalance in the system. Current number of active management server nodes in the system is " + allMS.size() +
- "; number of managed agents is " + allManagedAgents.size());
+ "; number of managed agents is " + allManagedAgents.size());
}
return;
}
@@ -942,7 +946,8 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
// remove the host from re-balance list and delete from op_host_transfer DB
// no need to do anything with the real attache as we haven't modified it yet
Date cutTime = DateUtil.currentGMTTime();
- HostTransferMapVO transferMap = _hostTransferDao.findActiveHostTransferMapByHostId(hostId, new Date(cutTime.getTime() - rebalanceTimeOut));
+ HostTransferMapVO transferMap =
+ _hostTransferDao.findActiveHostTransferMapByHostId(hostId, new Date(cutTime.getTime() - rebalanceTimeOut));
if (transferMap == null) {
s_logger.debug("Timed out waiting for the host id=" + hostId + " to be ready to transfer, skipping rebalance for the host");
@@ -960,7 +965,8 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
ManagementServerHostVO ms = _mshostDao.findByMsid(transferMap.getFutureOwner());
if (ms != null && ms.getState() != ManagementServerHost.State.Up) {
- s_logger.debug("Can't transfer host " + hostId + " as it's future owner is not in UP state: " + ms + ", skipping rebalance for the host");
+ s_logger.debug("Can't transfer host " + hostId + " as it's future owner is not in UP state: " + ms +
+ ", skipping rebalance for the host");
iterator.remove();
_hostTransferDao.completeAgentTransfer(hostId);
continue;
@@ -977,7 +983,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
} else {
s_logger.debug("Agent " + hostId + " can't be transfered yet as its request queue size is " + attache.getQueueSize() +
- " and listener queue size is " + attache.getNonRecurringListenersSize());
+ " and listener queue size is " + attache.getNonRecurringListenersSize());
}
}
} else {
@@ -1044,7 +1050,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
if (result) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Loading directly connected host " + host.getId() + "(" + host.getName() + ") to the management server " + _nodeId +
- " as a part of rebalance process");
+ " as a part of rebalance process");
}
result = loadDirectlyConnectedHost(host, true);
} else {
@@ -1053,16 +1059,16 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
} catch (Exception ex) {
s_logger.warn("Failed to load directly connected host " + host.getId() + "(" + host.getName() + ") to the management server " + _nodeId +
- " as a part of rebalance process due to:", ex);
+ " as a part of rebalance process due to:", ex);
result = false;
}
if (result) {
s_logger.debug("Successfully loaded directly connected host " + host.getId() + "(" + host.getName() + ") to the management server " + _nodeId +
- " as a part of rebalance process");
+ " as a part of rebalance process");
} else {
s_logger.warn("Failed to load directly connected host " + host.getId() + "(" + host.getName() + ") to the management server " + _nodeId +
- " as a part of rebalance process");
+ " as a part of rebalance process");
}
}
@@ -1093,8 +1099,8 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
//2) Get all transfer requests and route them to peer
Request requestToTransfer = forwardAttache.getRequestToTransfer();
while (requestToTransfer != null) {
- s_logger.debug("Forwarding request " + requestToTransfer.getSequence() + " held in transfer attache " + hostId + " from the management server " + _nodeId + " to " +
- futureOwnerId);
+ s_logger.debug("Forwarding request " + requestToTransfer.getSequence() + " held in transfer attache " + hostId + " from the management server " +
+ _nodeId + " to " + futureOwnerId);
boolean routeResult = routeToPeer(Long.toString(futureOwnerId), requestToTransfer.getBytes());
if (!routeResult) {
logD(requestToTransfer.getBytes(), "Failed to route request to peer");
@@ -1148,7 +1154,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
s_logger.warn("Attache for the agent " + hostId + " no longer exists on management server " + _nodeId + ", can't start host rebalancing");
} else {
s_logger.warn("Attache for the agent " + hostId + " has request queue size= " + attache.getQueueSize() + " and listener queue size " +
- attache.getNonRecurringListenersSize() + ", can't start host rebalancing");
+ attache.getNonRecurringListenersSize() + ", can't start host rebalancing");
}
return false;
}
@@ -1205,7 +1211,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
// Scheduling host scan task in peer MS is a best effort operation during host add, regular host scan
// happens at fixed intervals anyways. So handling any exceptions that may be thrown
s_logger.warn("Exception happened while trying to schedule host scan task on mgmt server " + _clusterMgr.getSelfPeerName() +
- ", ignoring as regular host scan happens at fixed interval anyways", e);
+ ", ignoring as regular host scan happens at fixed interval anyways", e);
return null;
}
@@ -1321,15 +1327,15 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
String jsonReturn = _gson.toJson(answers);
if (s_logger.isDebugEnabled()) {
- s_logger.debug("Completed dispatching -> " + pdu.getAgentId() + ", json: " + pdu.getJsonPackage() + " in " + (System.currentTimeMillis() - startTick) +
- " ms, return result: " + jsonReturn);
+ s_logger.debug("Completed dispatching -> " + pdu.getAgentId() + ", json: " + pdu.getJsonPackage() + " in " +
+ (System.currentTimeMillis() - startTick) + " ms, return result: " + jsonReturn);
}
return jsonReturn;
} else {
if (s_logger.isDebugEnabled()) {
- s_logger.debug("Completed dispatching -> " + pdu.getAgentId() + ", json: " + pdu.getJsonPackage() + " in " + (System.currentTimeMillis() - startTick) +
- " ms, return null result");
+ s_logger.debug("Completed dispatching -> " + pdu.getAgentId() + ", json: " + pdu.getJsonPackage() + " in " +
+ (System.currentTimeMillis() - startTick) + " ms, return null result");
}
}
} catch (AgentUnavailableException e) {
@@ -1379,12 +1385,12 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
double load = managedHostsCount / allHostsCount;
if (load >= ConnectedAgentThreshold.value()) {
s_logger.debug("Scheduling agent rebalancing task as the average agent load " + load + " is more than the threshold " +
- ConnectedAgentThreshold.value());
+ ConnectedAgentThreshold.value());
scheduleRebalanceAgents();
_agentLbHappened = true;
} else {
s_logger.debug("Not scheduling agent rebalancing task as the averages load " + load + " is less than the threshold " +
- ConnectedAgentThreshold.value());
+ ConnectedAgentThreshold.value());
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/com/cloud/agent/manager/ClusteredDirectAgentAttache.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/ClusteredDirectAgentAttache.java b/engine/orchestration/src/com/cloud/agent/manager/ClusteredDirectAgentAttache.java
index 0f235fa..d7c0827 100755
--- a/engine/orchestration/src/com/cloud/agent/manager/ClusteredDirectAgentAttache.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/ClusteredDirectAgentAttache.java
@@ -16,7 +16,6 @@
// under the License.
package com.cloud.agent.manager;
-import com.cloud.agent.AgentManager;
import com.cloud.agent.transport.Request;
import com.cloud.agent.transport.Response;
import com.cloud.exception.AgentUnavailableException;
@@ -28,7 +27,8 @@ public class ClusteredDirectAgentAttache extends DirectAgentAttache implements R
private final ClusteredAgentManagerImpl _mgr;
private final long _nodeId;
- public ClusteredDirectAgentAttache(AgentManagerImpl agentMgr, long id, String name, long mgmtId, ServerResource resource, boolean maintenance, ClusteredAgentManagerImpl mgr) {
+ public ClusteredDirectAgentAttache(AgentManagerImpl agentMgr, long id, String name, long mgmtId, ServerResource resource, boolean maintenance,
+ ClusteredAgentManagerImpl mgr) {
super(agentMgr, id, name, resource, maintenance, mgr);
_mgr = mgr;
_nodeId = mgmtId;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java b/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
index 29b146a..ef002d0 100755
--- a/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
@@ -21,9 +21,10 @@ import java.util.List;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
-import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.CronCommand;
@@ -133,7 +134,8 @@ public class DirectAgentAttache extends AgentAttache {
protected synchronized void runInContext() {
try {
if (_outstandingTaskCount.incrementAndGet() > _agentMgr.getDirectAgentThreadCap()) {
- s_logger.warn("Task execution for direct attache(" + _id + ") has reached maximum outstanding limit(" + _agentMgr.getDirectAgentThreadCap() + "), bailing out");
+ s_logger.warn("Task execution for direct attache(" + _id + ") has reached maximum outstanding limit(" + _agentMgr.getDirectAgentThreadCap() +
+ "), bailing out");
return;
}
@@ -195,7 +197,8 @@ public class DirectAgentAttache extends AgentAttache {
long seq = _req.getSequence();
try {
if (_outstandingTaskCount.incrementAndGet() > _agentMgr.getDirectAgentThreadCap()) {
- s_logger.warn("Task execution for direct attache(" + _id + ") has reached maximum outstanding limit(" + _agentMgr.getDirectAgentThreadCap() + "), bailing out");
+ s_logger.warn("Task execution for direct attache(" + _id + ") has reached maximum outstanding limit(" + _agentMgr.getDirectAgentThreadCap() +
+ "), bailing out");
bailout();
return;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/com/cloud/agent/manager/SynchronousListener.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/SynchronousListener.java b/engine/orchestration/src/com/cloud/agent/manager/SynchronousListener.java
index 9d339a1..2146b00 100755
--- a/engine/orchestration/src/com/cloud/agent/manager/SynchronousListener.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/SynchronousListener.java
@@ -116,7 +116,8 @@ public class SynchronousListener implements Listener {
profiler.stop();
if (s_logger.isTraceEnabled()) {
- s_logger.trace("Synchronized command - sending completed, time: " + profiler.getDuration() + ", answer: " + (_answers != null ? _answers[0].toString() : "null"));
+ s_logger.trace("Synchronized command - sending completed, time: " + profiler.getDuration() + ", answer: " +
+ (_answers != null ? _answers[0].toString() : "null"));
}
return _answers;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java b/engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java
index aa30ab0..be75cf2 100755
--- a/engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java
+++ b/engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java
@@ -55,7 +55,7 @@ public class ClusterBasedAgentLoadBalancerPlanner extends AdapterBase implements
if (allHosts.size() <= avLoad) {
s_logger.debug("Agent load = " + allHosts.size() + " for management server " + msId + " doesn't exceed average system agent load = " + avLoad +
- "; so it doesn't participate in agent rebalancing process");
+ "; so it doesn't participate in agent rebalancing process");
return null;
}
@@ -65,7 +65,8 @@ public class ClusterBasedAgentLoadBalancerPlanner extends AdapterBase implements
List<HostVO> directHosts = sc.list();
if (directHosts.isEmpty()) {
- s_logger.debug("No direct agents in status " + Status.Up + " exist for the management server " + msId + "; so it doesn't participate in agent rebalancing process");
+ s_logger.debug("No direct agents in status " + Status.Up + " exist for the management server " + msId +
+ "; so it doesn't participate in agent rebalancing process");
return null;
}
@@ -91,7 +92,7 @@ public class ClusterBasedAgentLoadBalancerPlanner extends AdapterBase implements
List<HostVO> hostsToReturn = new ArrayList<HostVO>();
s_logger.debug("Management server " + msId + " can give away " + hostsToGive + " as it currently owns " + allHosts.size() +
- " and the average agent load in the system is " + avLoad + "; finalyzing list of hosts to give away...");
+ " and the average agent load in the system is " + avLoad + "; finalyzing list of hosts to give away...");
for (Long cluster : hostToClusterMap.keySet()) {
List<HostVO> hostsInCluster = hostToClusterMap.get(cluster);
hostsLeft = hostsLeft - hostsInCluster.size();
[54/54] [abbrv] git commit: updated refs/heads/reformat to 170f32f
Posted by ah...@apache.org.
Broke up some long strings
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/170f32f1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/170f32f1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/170f32f1
Branch: refs/heads/reformat
Commit: 170f32f1714f4e874f5ede92b8b305ffee9ea272
Parents: d620df2
Author: Alex Huang <al...@citrix.com>
Authored: Thu Nov 21 07:25:01 2013 -0800
Committer: Alex Huang <al...@citrix.com>
Committed: Thu Nov 21 07:25:01 2013 -0800
----------------------------------------------------------------------
.../com/cloud/agent/resource/DummyResource.java | 2 +-
api/src/com/cloud/agent/api/to/DhcpTO.java | 4 +-
.../com/cloud/agent/api/to/LoadBalancerTO.java | 8 +-
.../cloud/network/element/NetworkElement.java | 1 -
.../com/cloud/network/element/VpcProvider.java | 2 -
api/src/com/cloud/server/ManagementService.java | 3 -
.../command/admin/vlan/ListVlanIpRangesCmd.java | 5 +-
.../api/command/admin/vm/AssignVMCmd.java | 9 +-
.../api/response/HostForMigrationResponse.java | 5 +-
.../src/com/amazon/s3/client/AmazonS3Stub.java | 719 +++++++++++++------
.../engine/orchestration/CloudOrchestrator.java | 3 +-
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 10 +-
.../dc/dao/DataCenterIpAddressDaoImpl.java | 4 +-
.../cloud/upgrade/dao/Upgrade2213to2214.java | 13 +-
.../com/cloud/upgrade/dao/Upgrade2214to30.java | 35 +-
.../com/cloud/upgrade/dao/Upgrade302to40.java | 33 +-
.../com/cloud/upgrade/dao/Upgrade303to304.java | 33 +-
.../com/cloud/upgrade/dao/Upgrade305to306.java | 8 +-
.../com/cloud/upgrade/dao/Upgrade40to41.java | 12 +-
.../com/cloud/upgrade/dao/Upgrade410to420.java | 8 +-
.../com/cloud/upgrade/dao/VersionDaoImpl.java | 4 +-
.../src/com/cloud/usage/dao/UsageDaoImpl.java | 6 +-
.../com/cloud/usage/dao/UsageVmDiskDaoImpl.java | 8 +-
.../src/com/cloud/vm/dao/UserVmDaoImpl.java | 38 +-
.../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 16 +-
pom.xml | 4 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 3 +-
.../network/firewall/FirewallManagerImpl.java | 23 +-
.../com/cloud/vpc/MockNetworkManagerImpl.java | 3 -
.../test/regression/PortForwardingTest.java | 15 +-
.../hypervisor/vmware/util/VmwareContext.java | 1 -
31 files changed, 675 insertions(+), 363 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/agent/src/com/cloud/agent/resource/DummyResource.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/resource/DummyResource.java b/agent/src/com/cloud/agent/resource/DummyResource.java
index ec262a8..816f6ed 100755
--- a/agent/src/com/cloud/agent/resource/DummyResource.java
+++ b/agent/src/com/cloud/agent/resource/DummyResource.java
@@ -49,7 +49,7 @@ public class DummyResource implements ServerResource {
Host.Type _type;
boolean _negative;
IAgentControl _agentControl;
- private Map<String, Object> _params;
+ Map<String, Object> _params;
@Override
public void disconnected() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/api/src/com/cloud/agent/api/to/DhcpTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/DhcpTO.java b/api/src/com/cloud/agent/api/to/DhcpTO.java
index 56f6b47..50e90ae 100644
--- a/api/src/com/cloud/agent/api/to/DhcpTO.java
+++ b/api/src/com/cloud/agent/api/to/DhcpTO.java
@@ -22,9 +22,9 @@ public class DhcpTO {
String netmask;
String startIpOfSubnet;
- public DhcpTO(String routerIp, String gateway, String netmask, String StartIpOfSubnet) {
+ public DhcpTO(String routerIp, String gateway, String netmask, String startIpOfSubnet) {
this.routerIp = routerIp;
- this.startIpOfSubnet = StartIpOfSubnet;
+ this.startIpOfSubnet = startIpOfSubnet;
this.gateway = gateway;
this.netmask = netmask;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/api/src/com/cloud/agent/api/to/LoadBalancerTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/LoadBalancerTO.java b/api/src/com/cloud/agent/api/to/LoadBalancerTO.java
index aa979e5..baa83df 100644
--- a/api/src/com/cloud/agent/api/to/LoadBalancerTO.java
+++ b/api/src/com/cloud/agent/api/to/LoadBalancerTO.java
@@ -77,15 +77,15 @@ public class LoadBalancerTO {
}
public LoadBalancerTO(String id, String srcIp, int srcPort, String protocol, String algorithm, boolean revoked, boolean alreadyAdded, boolean inline,
- List<LbDestination> arg_destinations, List<LbStickinessPolicy> stickinessPolicies) {
+ List<LbDestination> argDestinations, List<LbStickinessPolicy> stickinessPolicies) {
- this(id, srcIp, srcPort, protocol, algorithm, revoked, alreadyAdded, inline, arg_destinations, stickinessPolicies, null, null, null);
+ this(id, srcIp, srcPort, protocol, algorithm, revoked, alreadyAdded, inline, argDestinations, stickinessPolicies, null, null, null);
}
public LoadBalancerTO(String id, String srcIp, int srcPort, String protocol, String algorithm, boolean revoked, boolean alreadyAdded, boolean inline,
- List<LbDestination> arg_destinations, List<LbStickinessPolicy> stickinessPolicies, List<LbHealthCheckPolicy> healthCheckPolicies, LbSslCert sslCert,
+ List<LbDestination> argDestinations, List<LbStickinessPolicy> stickinessPolicies, List<LbHealthCheckPolicy> healthCheckPolicies, LbSslCert sslCert,
String lbProtocol) {
- this(id, srcIp, srcPort, protocol, algorithm, revoked, alreadyAdded, inline, arg_destinations);
+ this(id, srcIp, srcPort, protocol, algorithm, revoked, alreadyAdded, inline, argDestinations);
this.stickinessPolicies = null;
this.healthCheckPolicies = null;
if (stickinessPolicies != null && stickinessPolicies.size() > 0) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/api/src/com/cloud/network/element/NetworkElement.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/element/NetworkElement.java b/api/src/com/cloud/network/element/NetworkElement.java
index dda3a14..e7988bf 100644
--- a/api/src/com/cloud/network/element/NetworkElement.java
+++ b/api/src/com/cloud/network/element/NetworkElement.java
@@ -53,7 +53,6 @@ public interface NetworkElement extends Adapter {
* @param config fully specified network configuration.
* @param offering network offering that originated the network configuration.
* @return true if network configuration is now usable; false if not; null if not handled by this element.
- * @throws InsufficientNetworkCapacityException TODO
*/
boolean implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException,
ResourceUnavailableException, InsufficientCapacityException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/api/src/com/cloud/network/element/VpcProvider.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/element/VpcProvider.java b/api/src/com/cloud/network/element/VpcProvider.java
index 5165481..14e8619 100644
--- a/api/src/com/cloud/network/element/VpcProvider.java
+++ b/api/src/com/cloud/network/element/VpcProvider.java
@@ -21,7 +21,6 @@ import java.util.List;
import com.cloud.deploy.DeployDestination;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.InsufficientNetworkCapacityException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.vpc.NetworkACLItem;
import com.cloud.network.vpc.PrivateGateway;
@@ -33,7 +32,6 @@ public interface VpcProvider extends NetworkElement {
/**
* Start vpc element as specified
* @param vpc fully specified vpc configuration.
- * @throws InsufficientNetworkCapacityException TODO
*/
boolean implementVpc(Vpc vpc, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException,
InsufficientCapacityException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/api/src/com/cloud/server/ManagementService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java
index ce62326..24fad87 100755
--- a/api/src/com/cloud/server/ManagementService.java
+++ b/api/src/com/cloud/server/ManagementService.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.admin.cluster.ListClustersCmd;
import org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd;
import org.apache.cloudstack.api.command.admin.domain.UpdateDomainCmd;
@@ -250,8 +249,6 @@ public interface ManagementService {
* @param cmd
* -- upload certificate cmd
* @return -- returns a string on success
- * @throws ServerApiException
- * -- even if one of the console proxy patching fails, we throw back this exception
*/
String uploadCertificate(UploadCustomCertificateCmd cmd);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
index f629af8..9d6eae6 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
@@ -58,7 +58,8 @@ public class ListVlanIpRangesCmd extends BaseListCmd {
@Parameter(name = ApiConstants.DOMAIN_ID,
type = CommandType.UUID,
entityType = DomainResponse.class,
- description = "the domain ID with which the VLAN IP range is associated. If used with the account parameter, returns all VLAN IP ranges for that account in the specified domain.")
+ description = "the domain ID with which the VLAN IP range is associated. If used with the account parameter, " +
+ "returns all VLAN IP ranges for that account in the specified domain.")
private Long domainId;
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = VlanIpRangeResponse.class, required = false, description = "the ID of the VLAN IP range")
@@ -151,6 +152,6 @@ public class ListVlanIpRangesCmd extends BaseListCmd {
response.setResponses(vlanResponses, vlans.second());
response.setResponseName(getCommandName());
- this.setResponseObject(response);
+ setResponseObject(response);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
index e85c288..c9b5c9f 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
@@ -65,14 +65,17 @@ public class AssignVMCmd extends BaseCmd {
type = CommandType.LIST,
collectionType = CommandType.UUID,
entityType = NetworkResponse.class,
- description = "list of new network ids in which the moved VM will participate. In case no network ids are provided the VM will be part of the default network for that zone. In case there is no network yet created for the new account the default network will be created.")
+ description = "list of new network ids in which the moved VM will participate. In case no network ids are provided the VM will be part of the default network for that zone. "
+ +
+ "In case there is no network yet created for the new account the default network will be created.")
private List<Long> networkIds;
@Parameter(name = ApiConstants.SECURITY_GROUP_IDS,
type = CommandType.LIST,
collectionType = CommandType.UUID,
entityType = SecurityGroupResponse.class,
- description = "list of security group ids to be applied on the virtual machine. In case no security groups are provided the VM is part of the default security group.")
+ description = "list of security group ids to be applied on the virtual machine. " +
+ "In case no security groups are provided the VM is part of the default security group.")
private List<Long> securityGroupIdList;
/////////////////////////////////////////////////////
@@ -117,7 +120,7 @@ public class AssignVMCmd extends BaseCmd {
}
UserVmResponse response = _responseGenerator.createUserVmResponse("virtualmachine", userVm).get(0);
response.setResponseName(getCommandName());
- this.setResponseObject(response);
+ setResponseObject(response);
} catch (Exception e) {
e.printStackTrace();
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm " + e.getMessage());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java b/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java
index 6e2e745..2f3c86b 100644
--- a/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java
@@ -188,7 +188,8 @@ public class HostForMigrationResponse extends BaseResponse {
private Boolean hasEnoughCapacity;
@SerializedName("suitableformigration")
- @Param(description = "true if this host is suitable(has enough capacity and satisfies all conditions like hosttags, max guests vm limit etc) to migrate a VM to it , false otherwise")
+ @Param(description = "true if this host is suitable(has enough capacity and satisfies all conditions like hosttags, " +
+ "max guests vm limit etc) to migrate a VM to it , false otherwise")
private Boolean suitableForMigration;
@SerializedName("requiresStorageMotion")
@@ -209,7 +210,7 @@ public class HostForMigrationResponse extends BaseResponse {
@Override
public String getObjectId() {
- return this.getId();
+ return getId();
}
public String getId() {
[07/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
index 54488d5..fd9e057 100644
--- a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
@@ -43,8 +43,8 @@ public class CreatePrivateTemplateFromSnapshotCommand extends SnapshotCommand {
* @param origTemplateInstallPath The install path of the original template VHD on the secondary
*/
- public CreatePrivateTemplateFromSnapshotCommand(StoragePool pool, String secondaryStoragePoolURL, Long dcId, Long accountId, Long volumeId, String backedUpSnapshotUuid,
- String backedUpSnapshotName, String origTemplateInstallPath, Long newTemplateId, String templateName, int wait) {
+ public CreatePrivateTemplateFromSnapshotCommand(StoragePool pool, String secondaryStoragePoolURL, Long dcId, Long accountId, Long volumeId,
+ String backedUpSnapshotUuid, String backedUpSnapshotName, String origTemplateInstallPath, Long newTemplateId, String templateName, int wait) {
super(pool, secondaryStoragePoolURL, backedUpSnapshotUuid, backedUpSnapshotName, dcId, accountId, volumeId);
this.origTemplateInstallPath = origTemplateInstallPath;
this.newTemplateId = newTemplateId;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java
index d81acd8..84f50af 100644
--- a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java
+++ b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java
@@ -33,8 +33,8 @@ public class CreatePrivateTemplateFromVolumeCommand extends SnapshotCommand {
public CreatePrivateTemplateFromVolumeCommand() {
}
- public CreatePrivateTemplateFromVolumeCommand(StoragePool pool, String secondaryStorageUrl, long templateId, long accountId, String userSpecifiedName, String uniqueName,
- String volumePath, String vmName, int wait) {
+ public CreatePrivateTemplateFromVolumeCommand(StoragePool pool, String secondaryStorageUrl, long templateId, long accountId, String userSpecifiedName,
+ String uniqueName, String volumePath, String vmName, int wait) {
_secondaryStorageUrl = secondaryStorageUrl;
_templateId = templateId;
_accountId = accountId;
@@ -52,10 +52,12 @@ public class CreatePrivateTemplateFromVolumeCommand extends SnapshotCommand {
return false;
}
+ @Override
public StorageFilerTO getPool() {
return _primaryPool;
}
+ @Override
public String getSecondaryStorageUrl() {
return _secondaryStorageUrl;
}
@@ -76,14 +78,17 @@ public class CreatePrivateTemplateFromVolumeCommand extends SnapshotCommand {
return _vmName;
}
+ @Override
public void setVolumePath(String _volumePath) {
this._volumePath = _volumePath;
}
+ @Override
public String getVolumePath() {
return _volumePath;
}
+ @Override
public Long getAccountId() {
return _accountId;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java
index ef96911..ea0384e 100644
--- a/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java
+++ b/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java
@@ -17,10 +17,10 @@
package com.cloud.agent.api;
-import org.apache.cloudstack.storage.to.VolumeObjectTO;
-
import java.util.List;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
+
public class CreateVMSnapshotAnswer extends Answer {
private List<VolumeObjectTO> volumeTOs;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java b/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java
index 57d66a2..7f49155 100644
--- a/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java
@@ -18,11 +18,10 @@ package com.cloud.agent.api;
import java.util.List;
-import com.cloud.agent.api.to.DataTO;
-import com.cloud.agent.api.to.VolumeTO;
-import com.cloud.vm.VirtualMachine;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
+import com.cloud.vm.VirtualMachine;
+
public class CreateVMSnapshotCommand extends VMSnapshotBaseCommand {
public CreateVMSnapshotCommand(String vmName, VMSnapshotTO snapshot, List<VolumeObjectTO> volumeTOs, String guestOSType, VirtualMachine.State vmState) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java b/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java
index ff43322..f36ad3d 100644
--- a/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java
@@ -52,7 +52,8 @@ public class CreateVolumeFromVMSnapshotCommand extends Command {
this.storagePoolUuid = storagePoolUuid;
}
- public CreateVolumeFromVMSnapshotCommand(String path, String name, Boolean fullClone, String storagePoolUuid, StorageFilerTO pool, DiskProfile diskProfile, Long volumeId) {
+ public CreateVolumeFromVMSnapshotCommand(String path, String name, Boolean fullClone, String storagePoolUuid, StorageFilerTO pool, DiskProfile diskProfile,
+ Long volumeId) {
this.path = path;
this.name = name;
this.fullClone = fullClone;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java
index 1d26d0f..798cd54 100644
--- a/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java
+++ b/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java
@@ -16,10 +16,10 @@
// under the License.
package com.cloud.agent.api;
-import org.apache.cloudstack.storage.to.VolumeObjectTO;
-
import java.util.List;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
+
public class DeleteVMSnapshotAnswer extends Answer {
private List<VolumeObjectTO> volumeTOs;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java b/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java
index d9e4c6d..0d20050 100644
--- a/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java
@@ -18,7 +18,6 @@ package com.cloud.agent.api;
import java.util.List;
-import com.cloud.agent.api.to.VolumeTO;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
public class DeleteVMSnapshotCommand extends VMSnapshotBaseCommand {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/HostStatsEntry.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/HostStatsEntry.java b/core/src/com/cloud/agent/api/HostStatsEntry.java
index 02734fd..c9d25a0 100644
--- a/core/src/com/cloud/agent/api/HostStatsEntry.java
+++ b/core/src/com/cloud/agent/api/HostStatsEntry.java
@@ -31,8 +31,8 @@ public class HostStatsEntry implements HostStats {
public HostStatsEntry() {
}
- public HostStatsEntry(long hostId, double cpuUtilization, double networkReadKBs, double networkWriteKBs, String entityType, double totalMemoryKBs, double freeMemoryKBs,
- double xapiMemoryUsageKBs, double averageLoad) {
+ public HostStatsEntry(long hostId, double cpuUtilization, double networkReadKBs, double networkWriteKBs, String entityType, double totalMemoryKBs,
+ double freeMemoryKBs, double xapiMemoryUsageKBs, double averageLoad) {
this.hostId = hostId;
this.entityType = entityType;
this.cpuUtilization = cpuUtilization;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java
index a108a2a..a94697a 100644
--- a/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java
+++ b/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java
@@ -17,9 +17,10 @@
package com.cloud.agent.api;
import java.util.Map;
+
+import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.agent.api.to.VolumeTO;
-import com.cloud.agent.api.to.StorageFilerTO;
public class MigrateWithStorageCommand extends Command {
VirtualMachineTO vm;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java
index 76ceddd..ebb0db5 100644
--- a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java
+++ b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java
@@ -17,8 +17,9 @@
package com.cloud.agent.api;
import java.util.Map;
-import com.cloud.agent.api.to.VolumeTO;
+
import com.cloud.agent.api.to.NicTO;
+import com.cloud.agent.api.to.VolumeTO;
public class MigrateWithStorageReceiveAnswer extends Answer {
@@ -33,7 +34,8 @@ public class MigrateWithStorageReceiveAnswer extends Answer {
token = null;
}
- public MigrateWithStorageReceiveAnswer(MigrateWithStorageReceiveCommand cmd, Map<VolumeTO, Object> volumeToSr, Map<NicTO, Object> nicToNetwork, Map<String, String> token) {
+ public MigrateWithStorageReceiveAnswer(MigrateWithStorageReceiveCommand cmd, Map<VolumeTO, Object> volumeToSr, Map<NicTO, Object> nicToNetwork,
+ Map<String, String> token) {
super(cmd, true, null);
this.volumeToSr = volumeToSr;
this.nicToNetwork = nicToNetwork;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java
index df67405..0d1e7f6 100644
--- a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java
+++ b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java
@@ -17,9 +17,10 @@
package com.cloud.agent.api;
import java.util.Map;
+
+import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.agent.api.to.VolumeTO;
-import com.cloud.agent.api.to.StorageFilerTO;
public class MigrateWithStorageReceiveCommand extends Command {
VirtualMachineTO vm;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java b/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java
index 7cf641f..314c876 100644
--- a/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java
+++ b/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java
@@ -17,6 +17,7 @@
package com.cloud.agent.api;
import java.util.Set;
+
import com.cloud.agent.api.to.VolumeTO;
public class MigrateWithStorageSendAnswer extends Answer {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java
index 7ded645..6231b16b 100644
--- a/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java
+++ b/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java
@@ -17,9 +17,10 @@
package com.cloud.agent.api;
import java.util.Map;
+
+import com.cloud.agent.api.to.NicTO;
import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.agent.api.to.VolumeTO;
-import com.cloud.agent.api.to.NicTO;
public class MigrateWithStorageSendCommand extends Command {
VirtualMachineTO vm;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java b/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java
index 5d6d236..5163c48 100644
--- a/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java
+++ b/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java
@@ -30,7 +30,8 @@ public class ModifyStoragePoolAnswer extends Answer {
public ModifyStoragePoolAnswer(ModifyStoragePoolCommand cmd, long capacityBytes, long availableBytes, Map<String, TemplateProp> tInfo) {
super(cmd);
this.result = true;
- this.poolInfo = new StoragePoolInfo(null, cmd.getPool().getHost(), cmd.getPool().getPath(), cmd.getLocalPath(), cmd.getPool().getType(), capacityBytes, availableBytes);
+ this.poolInfo =
+ new StoragePoolInfo(null, cmd.getPool().getHost(), cmd.getPool().getPath(), cmd.getLocalPath(), cmd.getPool().getType(), capacityBytes, availableBytes);
this.templateInfo = tInfo;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java b/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java
index e783d30..23cdcca 100644
--- a/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java
+++ b/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java
@@ -30,7 +30,8 @@ public class PingRoutingWithOvsCommand extends PingRoutingCommand {
super();
}
- public PingRoutingWithOvsCommand(Host.Type type, long id, Map<String, State> states, Map<String, HostVmStateReportEntry> hostVmStateReport, List<Pair<String, Long>> ovsStates) {
+ public PingRoutingWithOvsCommand(Host.Type type, long id, Map<String, State> states, Map<String, HostVmStateReportEntry> hostVmStateReport,
+ List<Pair<String, Long>> ovsStates) {
super(type, id, states, hostVmStateReport);
this.states = ovsStates;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java b/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java
index ec27c3d..f6e8804 100644
--- a/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java
+++ b/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java
@@ -23,6 +23,7 @@ public class RecurringNetworkUsageCommand extends Command implements CronCommand
this.interval = interval;
}
+ @Override
public int getInterval() {
return interval;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java
index 4cdc47d..7168b89 100644
--- a/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java
+++ b/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java
@@ -17,10 +17,11 @@
package com.cloud.agent.api;
-import com.cloud.vm.VirtualMachine;
+import java.util.List;
+
import org.apache.cloudstack.storage.to.VolumeObjectTO;
-import java.util.List;
+import com.cloud.vm.VirtualMachine;
public class RevertToVMSnapshotAnswer extends Answer {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java b/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
index b231441..853a068 100644
--- a/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
+++ b/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
@@ -57,7 +57,8 @@ public class SetupGuestNetworkCommand extends NetworkElementCommand {
protected SetupGuestNetworkCommand() {
}
- public SetupGuestNetworkCommand(String dhcpRange, String networkDomain, boolean isRedundant, Integer priority, String defaultDns1, String defaultDns2, boolean add, NicTO nic) {
+ public SetupGuestNetworkCommand(String dhcpRange, String networkDomain, boolean isRedundant, Integer priority, String defaultDns1, String defaultDns2, boolean add,
+ NicTO nic) {
this.dhcpRange = dhcpRange;
this.networkDomain = networkDomain;
this.defaultDns1 = defaultDns1;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/StartupRoutingCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartupRoutingCommand.java b/core/src/com/cloud/agent/api/StartupRoutingCommand.java
index 6ff9288..626c87f 100755
--- a/core/src/com/cloud/agent/api/StartupRoutingCommand.java
+++ b/core/src/com/cloud/agent/api/StartupRoutingCommand.java
@@ -78,14 +78,22 @@ public class StartupRoutingCommand extends StartupCommand {
}
- public StartupRoutingCommand(int cpus, long speed, long memory, long dom0MinMemory, String caps, HypervisorType hypervisorType, RouterPrivateIpStrategy privIpStrategy,
- Map<String, VmState> vms, Map<String, HostVmStateReportEntry> hostVmStateReport) {
+ public StartupRoutingCommand(int cpus, long speed, long memory, long dom0MinMemory, String caps, HypervisorType hypervisorType,
+ RouterPrivateIpStrategy privIpStrategy, Map<String, VmState> vms, Map<String, HostVmStateReportEntry> hostVmStateReport) {
this(cpus, speed, memory, dom0MinMemory, caps, hypervisorType, vms, hostVmStateReport);
getHostDetails().put(RouterPrivateIpStrategy.class.getCanonicalName(), privIpStrategy.toString());
}
public StartupRoutingCommand(int cpus, long speed, long memory, long dom0MinMemory, String caps, HypervisorType hypervisorType, RouterPrivateIpStrategy privIpStrategy) {
- this(cpus, speed, memory, dom0MinMemory, caps, hypervisorType, new HashMap<String, String>(), new HashMap<String, VmState>(), new HashMap<String, HostVmStateReportEntry>());
+ this(cpus,
+ speed,
+ memory,
+ dom0MinMemory,
+ caps,
+ hypervisorType,
+ new HashMap<String, String>(),
+ new HashMap<String, VmState>(),
+ new HashMap<String, HostVmStateReportEntry>());
getHostDetails().put(RouterPrivateIpStrategy.class.getCanonicalName(), privIpStrategy.toString());
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java b/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java
index 0dda6dd..2911d2e 100644
--- a/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java
+++ b/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java
@@ -16,7 +16,6 @@
// under the License.
package com.cloud.agent.api;
-import com.cloud.agent.api.Command;
import com.cloud.host.Host;
/**
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java b/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java
index 6b880d5..d2abd54 100644
--- a/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java
+++ b/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java
@@ -19,8 +19,6 @@ package com.cloud.agent.api;
import java.util.List;
-import com.cloud.agent.api.to.DataTO;
-import com.cloud.agent.api.to.VolumeTO;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
public class VMSnapshotBaseCommand extends Command {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/VmDiskStatsEntry.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/VmDiskStatsEntry.java b/core/src/com/cloud/agent/api/VmDiskStatsEntry.java
index 765f4e4..e5d7841 100644
--- a/core/src/com/cloud/agent/api/VmDiskStatsEntry.java
+++ b/core/src/com/cloud/agent/api/VmDiskStatsEntry.java
@@ -59,6 +59,7 @@ public class VmDiskStatsEntry implements VmDiskStats {
this.bytesRead = bytesRead;
}
+ @Override
public long getBytesRead() {
return bytesRead;
}
@@ -67,6 +68,7 @@ public class VmDiskStatsEntry implements VmDiskStats {
this.bytesWrite = bytesWrite;
}
+ @Override
public long getBytesWrite() {
return bytesWrite;
}
@@ -75,6 +77,7 @@ public class VmDiskStatsEntry implements VmDiskStats {
this.ioRead = ioRead;
}
+ @Override
public long getIORead() {
return ioRead;
}
@@ -83,6 +86,7 @@ public class VmDiskStatsEntry implements VmDiskStats {
this.ioWrite = ioWrite;
}
+ @Override
public long getIOWrite() {
return ioWrite;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/VmStatsEntry.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/VmStatsEntry.java b/core/src/com/cloud/agent/api/VmStatsEntry.java
index a8238bc..a7a1968 100755
--- a/core/src/com/cloud/agent/api/VmStatsEntry.java
+++ b/core/src/com/cloud/agent/api/VmStatsEntry.java
@@ -51,6 +51,7 @@ public class VmStatsEntry implements VmStats {
this.entityType = entityType;
}
+ @Override
public double getCPUUtilization() {
return cpuUtilization;
}
@@ -59,6 +60,7 @@ public class VmStatsEntry implements VmStats {
this.cpuUtilization = cpuUtilization;
}
+ @Override
public double getNetworkReadKBs() {
return networkReadKBs;
}
@@ -67,6 +69,7 @@ public class VmStatsEntry implements VmStats {
this.networkReadKBs = networkReadKBs;
}
+ @Override
public double getNetworkWriteKBs() {
return networkWriteKBs;
}
@@ -75,6 +78,7 @@ public class VmStatsEntry implements VmStats {
this.networkWriteKBs = networkWriteKBs;
}
+ @Override
public double getDiskReadIOs() {
return diskReadIOs;
}
@@ -83,6 +87,7 @@ public class VmStatsEntry implements VmStats {
this.diskReadIOs = diskReadIOs;
}
+ @Override
public double getDiskWriteIOs() {
return diskWriteIOs;
}
@@ -91,6 +96,7 @@ public class VmStatsEntry implements VmStats {
this.diskWriteIOs = diskWriteIOs;
}
+ @Override
public double getDiskReadKBs() {
return diskReadKBs;
}
@@ -99,6 +105,7 @@ public class VmStatsEntry implements VmStats {
this.diskReadKBs = diskReadKBs;
}
+ @Override
public double getDiskWriteKBs() {
return diskWriteKBs;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java b/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
index a1b61f0..267ed8b 100644
--- a/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
+++ b/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
@@ -53,6 +53,7 @@ public class WatchConsoleProxyLoadCommand extends ProxyCommand implements CronCo
return proxyCmdPort;
}
+ @Override
public int getInterval() {
return interval;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java b/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java
index 4155013..49adc9e 100644
--- a/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java
+++ b/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java
@@ -16,10 +16,10 @@
// under the License.
package com.cloud.agent.api.routing;
-import com.cloud.agent.api.to.DhcpTO;
-
import java.util.List;
+import com.cloud.agent.api.to.DhcpTO;
+
public class DnsMasqConfigCommand extends NetworkElementCommand {
List<DhcpTO> dhcpTOs;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java b/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java
index 108bcce..9c5244a 100644
--- a/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java
+++ b/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java
@@ -17,10 +17,10 @@
package com.cloud.agent.api.routing;
-import com.cloud.agent.api.Command;
-
import java.util.List;
+import com.cloud.agent.api.Command;
+
/**
* GlobalLoadBalancerConfigCommand used for sending the GSLB configuration to GSLB service provider
*/
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java b/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java
index 08ef20c..12f57dc 100644
--- a/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java
+++ b/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java
@@ -16,9 +16,8 @@
// under the License.
package com.cloud.agent.api.routing;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
+
import com.cloud.agent.api.to.MonitorServiceTO;
/**
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java b/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
index e23e792..7f1916c 100644
--- a/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
+++ b/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
@@ -33,7 +33,8 @@ public class CopyVolumeCommand extends Command {
public CopyVolumeCommand() {
}
- public CopyVolumeCommand(long volumeId, String volumePath, StoragePool pool, String secondaryStorageURL, boolean toSecondaryStorage, int wait, boolean executeInSequence) {
+ public CopyVolumeCommand(long volumeId, String volumePath, StoragePool pool, String secondaryStorageURL, boolean toSecondaryStorage, int wait,
+ boolean executeInSequence) {
this.volumeId = volumeId;
this.volumePath = volumePath;
this.pool = new StorageFilerTO(pool);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
index d42fee2..56d9c30 100644
--- a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
+++ b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
@@ -31,7 +31,8 @@ public class CreatePrivateTemplateAnswer extends Answer {
super();
}
- public CreatePrivateTemplateAnswer(Command cmd, boolean success, String result, String path, long virtualSize, long physicalSize, String uniqueName, ImageFormat format) {
+ public CreatePrivateTemplateAnswer(Command cmd, boolean success, String result, String path, long virtualSize, long physicalSize, String uniqueName,
+ ImageFormat format) {
super(cmd, success, result);
_path = path;
_virtualSize = virtualSize;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/storage/DestroyCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/DestroyCommand.java b/core/src/com/cloud/agent/api/storage/DestroyCommand.java
index 4bd9f96..315ad25 100755
--- a/core/src/com/cloud/agent/api/storage/DestroyCommand.java
+++ b/core/src/com/cloud/agent/api/storage/DestroyCommand.java
@@ -35,8 +35,9 @@ public class DestroyCommand extends StorageCommand {
}
public DestroyCommand(StoragePool pool, VMTemplateStorageResourceAssoc templatePoolRef) {
- volume = new VolumeTO(templatePoolRef.getId(), null, pool.getPoolType(), pool.getUuid(), null, pool.getPath(), templatePoolRef.getInstallPath(),
- templatePoolRef.getTemplateSize(), null);
+ volume =
+ new VolumeTO(templatePoolRef.getId(), null, pool.getPoolType(), pool.getUuid(), null, pool.getPath(), templatePoolRef.getInstallPath(),
+ templatePoolRef.getTemplateSize(), null);
}
public VolumeTO getVolume() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index d23fcce..34450fe 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -446,8 +446,9 @@ public class VirtualRoutingResource implements Manager {
cfgFilePath = tmpCfgFile.getAbsolutePath();
}
- final String result = setLoadBalancerConfig(cfgFilePath, rules[LoadBalancerConfigurator.ADD], rules[LoadBalancerConfigurator.REMOVE],
- rules[LoadBalancerConfigurator.STATS], routerIp);
+ final String result =
+ setLoadBalancerConfig(cfgFilePath, rules[LoadBalancerConfigurator.ADD], rules[LoadBalancerConfigurator.REMOVE], rules[LoadBalancerConfigurator.STATS],
+ routerIp);
return new Answer(cmd, result == null, result);
} catch (final IOException e) {
@@ -486,8 +487,9 @@ public class VirtualRoutingResource implements Manager {
String routerName = cmd.getAccessDetail(NetworkElementCommand.ROUTER_NAME);
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
for (IpAddressTO ip : ips) {
- result = assignPublicIpAddress(routerName, routerIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(), ip.isSourceNat(), ip.getBroadcastUri(), ip.getVlanGateway(),
- ip.getVlanNetmask(), ip.getVifMacAddress(), 2, false);
+ result =
+ assignPublicIpAddress(routerName, routerIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(), ip.isSourceNat(), ip.getBroadcastUri(), ip.getVlanGateway(),
+ ip.getVlanNetmask(), ip.getVifMacAddress(), 2, false);
if (result != null) {
results[i++] = IpAssocAnswer.errorResult;
} else {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java b/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java
index 30e8319..1debdc8 100755
--- a/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java
+++ b/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.Map;
-import com.cloud.utils.exception.CloudRuntimeException;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonDeserializationContext;
@@ -33,6 +32,8 @@ import com.google.gson.JsonParseException;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
+import com.cloud.utils.exception.CloudRuntimeException;
+
public class ArrayTypeAdaptor<T> implements JsonDeserializer<T[]>, JsonSerializer<T[]> {
protected Gson _gson = null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java b/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java
index 7822ee8..8e25cc0 100644
--- a/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java
+++ b/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java
@@ -19,7 +19,6 @@ package com.cloud.agent.transport;
import java.lang.reflect.Type;
import java.util.Map;
-import com.cloud.utils.exception.CloudRuntimeException;
import com.google.gson.Gson;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
@@ -29,6 +28,8 @@ import com.google.gson.JsonParseException;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
+import com.cloud.utils.exception.CloudRuntimeException;
+
public class InterfaceTypeAdaptor<T> implements JsonDeserializer<T>, JsonSerializer<T> {
protected Gson _gson = null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java b/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java
index 7c76fa0..ce3f21a 100644
--- a/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java
+++ b/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java
@@ -18,11 +18,12 @@ package com.cloud.agent.transport;
import org.apache.log4j.Logger;
+import com.google.gson.ExclusionStrategy;
+import com.google.gson.FieldAttributes;
+
import com.cloud.agent.api.Command;
import com.cloud.agent.api.LogLevel;
import com.cloud.agent.api.LogLevel.Log4jLevel;
-import com.google.gson.ExclusionStrategy;
-import com.google.gson.FieldAttributes;
public class LoggingExclusionStrategy implements ExclusionStrategy {
Logger _logger = null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/network/HAProxyConfigurator.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/network/HAProxyConfigurator.java b/core/src/com/cloud/network/HAProxyConfigurator.java
index b6e18e6..e5fa787 100644
--- a/core/src/com/cloud/network/HAProxyConfigurator.java
+++ b/core/src/com/cloud/network/HAProxyConfigurator.java
@@ -26,25 +26,24 @@ import java.util.Set;
import org.apache.log4j.Logger;
-import com.cloud.utils.Pair;
-
import com.cloud.agent.api.routing.LoadBalancerConfigCommand;
import com.cloud.agent.api.to.LoadBalancerTO;
-import com.cloud.agent.api.to.PortForwardingRuleTO;
import com.cloud.agent.api.to.LoadBalancerTO.DestinationTO;
import com.cloud.agent.api.to.LoadBalancerTO.StickinessPolicyTO;
+import com.cloud.agent.api.to.PortForwardingRuleTO;
import com.cloud.network.rules.LbStickinessMethod.StickinessMethodType;
+import com.cloud.utils.Pair;
import com.cloud.utils.net.NetUtils;
public class HAProxyConfigurator implements LoadBalancerConfigurator {
private static final Logger s_logger = Logger.getLogger(HAProxyConfigurator.class);
private static final String blankLine = "\t ";
- private static String[] globalSection = {"global", "\tlog 127.0.0.1:3914 local0 warning", "\tmaxconn 4096", "\tmaxpipes 1024", "\tchroot /var/lib/haproxy", "\tuser haproxy",
- "\tgroup haproxy", "\tdaemon"};
+ private static String[] globalSection = {"global", "\tlog 127.0.0.1:3914 local0 warning", "\tmaxconn 4096", "\tmaxpipes 1024", "\tchroot /var/lib/haproxy",
+ "\tuser haproxy", "\tgroup haproxy", "\tdaemon"};
private static String[] defaultsSection = {"defaults", "\tlog global", "\tmode tcp", "\toption dontlognull", "\tretries 3", "\toption redispatch",
- "\toption forwardfor", "\toption forceclose", "\ttimeout connect 5000", "\ttimeout client 50000", "\ttimeout server 50000"};
+ "\toption forwardfor", "\toption forceclose", "\ttimeout connect 5000", "\ttimeout client 50000", "\ttimeout server 50000"};
private static String[] defaultListen = {"listen vmops 0.0.0.0:9", "\toption transparent"};
@@ -527,7 +526,10 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator {
s_logger.info("Haproxy mode http enabled");
rule.append("\n\tmode http\n\toption httpclose");
}
- rule.append("\n\tstats enable\n\tstats uri ").append(lbCmd.lbStatsUri).append("\n\tstats realm Haproxy\\ Statistics\n\tstats auth ").append(lbCmd.lbStatsAuth);
+ rule.append("\n\tstats enable\n\tstats uri ")
+ .append(lbCmd.lbStatsUri)
+ .append("\n\tstats realm Haproxy\\ Statistics\n\tstats auth ")
+ .append(lbCmd.lbStatsAuth);
rule.append("\n");
String result = rule.toString();
if (s_logger.isDebugEnabled()) {
@@ -587,9 +589,10 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator {
* stats will be available on the default http serving port, no
* special stats port
*/
- StringBuilder subRule = new StringBuilder("\tstats enable\n\tstats uri ").append(lbCmd.lbStatsUri)
- .append("\n\tstats realm Haproxy\\ Statistics\n\tstats auth ")
- .append(lbCmd.lbStatsAuth);
+ StringBuilder subRule =
+ new StringBuilder("\tstats enable\n\tstats uri ").append(lbCmd.lbStatsUri)
+ .append("\n\tstats realm Haproxy\\ Statistics\n\tstats auth ")
+ .append(lbCmd.lbStatsAuth);
result.add(subRule.toString());
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/network/resource/TrafficSentinelResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/network/resource/TrafficSentinelResource.java b/core/src/com/cloud/network/resource/TrafficSentinelResource.java
index 437891b..ada5f5e 100644
--- a/core/src/com/cloud/network/resource/TrafficSentinelResource.java
+++ b/core/src/com/cloud/network/resource/TrafficSentinelResource.java
@@ -204,8 +204,9 @@ public class TrafficSentinelResource implements ServerResource {
try {
//Query traffic Sentinel
- trafficSentinel = new URL(_url + "/inmsf/Query?script=" + URLEncoder.encode(getScript(cmd.getPublicIps(), cmd.getStart(), cmd.getEnd()), "UTF-8") +
- "&authenticate=basic&resultFormat=txt");
+ trafficSentinel =
+ new URL(_url + "/inmsf/Query?script=" + URLEncoder.encode(getScript(cmd.getPublicIps(), cmd.getStart(), cmd.getEnd()), "UTF-8") +
+ "&authenticate=basic&resultFormat=txt");
BufferedReader in = new BufferedReader(new InputStreamReader(trafficSentinel.openStream()));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/resource/ResourceListener.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/resource/ResourceListener.java b/core/src/com/cloud/resource/ResourceListener.java
index e6e8482..a911bc5 100755
--- a/core/src/com/cloud/resource/ResourceListener.java
+++ b/core/src/com/cloud/resource/ResourceListener.java
@@ -31,8 +31,8 @@ public interface ResourceListener {
static final Integer EVENT_CANCEL_MAINTENANCE_AFTER = 0x1 << 5;
static final Integer EVENT_PREPARE_MAINTENANCE_BEFORE = 0x1 << 6;
static final Integer EVENT_PREPARE_MAINTENANCE_AFTER = 0x1 << 7;
- static final Integer EVENT_ALL = (EVENT_DISCOVER_BEFORE | EVENT_DISCOVER_AFTER | EVENT_DELETE_HOST_BEFORE | EVENT_DELETE_HOST_AFTER | EVENT_CANCEL_MAINTENANCE_BEFORE |
- EVENT_CANCEL_MAINTENANCE_AFTER | EVENT_PREPARE_MAINTENANCE_BEFORE | EVENT_PREPARE_MAINTENANCE_AFTER);
+ static final Integer EVENT_ALL = (EVENT_DISCOVER_BEFORE | EVENT_DISCOVER_AFTER | EVENT_DELETE_HOST_BEFORE | EVENT_DELETE_HOST_AFTER |
+ EVENT_CANCEL_MAINTENANCE_BEFORE | EVENT_CANCEL_MAINTENANCE_AFTER | EVENT_PREPARE_MAINTENANCE_BEFORE | EVENT_PREPARE_MAINTENANCE_AFTER);
/**
*
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/resource/ServerResourceBase.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/resource/ServerResourceBase.java b/core/src/com/cloud/resource/ServerResourceBase.java
index 358ca90..4da9944 100755
--- a/core/src/com/cloud/resource/ServerResourceBase.java
+++ b/core/src/com/cloud/resource/ServerResourceBase.java
@@ -99,7 +99,7 @@ public abstract class ServerResourceBase implements ServerResource {
if (//!nic.isLoopback() &&
//nic.isUp() &&
!nic.isVirtual() && !nicName.startsWith("vnif") && !nicName.startsWith("vnbr") && !nicName.startsWith("peth") && !nicName.startsWith("vif") &&
- !nicName.startsWith("virbr") && !nicName.contains(":")) {
+ !nicName.startsWith("virbr") && !nicName.contains(":")) {
final String[] info = NetUtils.getNicParams(nicName);
if (info != null && info[0] != null) {
_privateNic = nic;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/serializer/GsonHelper.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/serializer/GsonHelper.java b/core/src/com/cloud/serializer/GsonHelper.java
index ca22d1d..4349b4a 100644
--- a/core/src/com/cloud/serializer/GsonHelper.java
+++ b/core/src/com/cloud/serializer/GsonHelper.java
@@ -20,6 +20,10 @@ import java.util.List;
import org.apache.log4j.Logger;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.SecStorageFirewallCfgCommand.PortConfig;
@@ -31,9 +35,6 @@ import com.cloud.agent.transport.LoggingExclusionStrategy;
import com.cloud.agent.transport.Request.NwGroupsCommandTypeAdaptor;
import com.cloud.agent.transport.Request.PortConfigListTypeAdaptor;
import com.cloud.utils.Pair;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
public class GsonHelper {
private static final Logger s_logger = Logger.getLogger(GsonHelper.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/serializer/SerializerHelper.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/serializer/SerializerHelper.java b/core/src/com/cloud/serializer/SerializerHelper.java
index 42fbf07..1ba55fc 100644
--- a/core/src/com/cloud/serializer/SerializerHelper.java
+++ b/core/src/com/cloud/serializer/SerializerHelper.java
@@ -26,9 +26,10 @@ import java.util.List;
import org.apache.log4j.Logger;
+import com.google.gson.Gson;
+
import com.cloud.utils.DateUtil;
import com.cloud.utils.Pair;
-import com.google.gson.Gson;
/**
* Note: toPairList and appendPairList only support simple POJO objects currently
@@ -155,7 +156,7 @@ public class SerializerHelper {
} catch (NoSuchMethodException e1) {
if (s_logger.isTraceEnabled()) {
s_logger.trace("POJO " + o.getClass().getName() + " does not have " + methodName + "() method for property: " + propName +
- ", will check is-prefixed method to see if it is boolean property");
+ ", will check is-prefixed method to see if it is boolean property");
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/resource/StorageProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/resource/StorageProcessor.java b/core/src/com/cloud/storage/resource/StorageProcessor.java
index 1136b08..d49a64b 100644
--- a/core/src/com/cloud/storage/resource/StorageProcessor.java
+++ b/core/src/com/cloud/storage/resource/StorageProcessor.java
@@ -27,8 +27,6 @@ import org.apache.cloudstack.storage.command.ForgetObjectCmd;
import org.apache.cloudstack.storage.command.IntroduceObjectCmd;
import com.cloud.agent.api.Answer;
-import org.apache.cloudstack.storage.command.ForgetObjectCmd;
-import org.apache.cloudstack.storage.command.IntroduceObjectCmd;
public interface StorageProcessor {
public Answer copyTemplateToPrimaryStorage(CopyCommand cmd);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java b/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
index 88a7dd2..61af4d9 100644
--- a/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
+++ b/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
@@ -75,11 +75,12 @@ public class StorageSubsystemCommandHandlerBase implements StorageSubsystemComma
destData.getDataStore().getRole() == DataStoreRole.Primary) {
//copy template to primary storage
return processor.copyTemplateToPrimaryStorage(cmd);
- } else if (srcData.getObjectType() == DataObjectType.TEMPLATE && srcDataStore.getRole() == DataStoreRole.Primary && destDataStore.getRole() == DataStoreRole.Primary) {
+ } else if (srcData.getObjectType() == DataObjectType.TEMPLATE && srcDataStore.getRole() == DataStoreRole.Primary &&
+ destDataStore.getRole() == DataStoreRole.Primary) {
//clone template to a volume
return processor.cloneVolumeFromBaseTemplate(cmd);
} else if (srcData.getObjectType() == DataObjectType.VOLUME &&
- (srcData.getDataStore().getRole() == DataStoreRole.ImageCache || srcDataStore.getRole() == DataStoreRole.Image)) {
+ (srcData.getDataStore().getRole() == DataStoreRole.ImageCache || srcDataStore.getRole() == DataStoreRole.Image)) {
//copy volume from image cache to primary
return processor.copyVolumeFromImageCacheToPrimary(cmd);
} else if (srcData.getObjectType() == DataObjectType.VOLUME && srcData.getDataStore().getRole() == DataStoreRole.Primary) {
@@ -89,7 +90,7 @@ public class StorageSubsystemCommandHandlerBase implements StorageSubsystemComma
return processor.createTemplateFromVolume(cmd);
}
} else if (srcData.getObjectType() == DataObjectType.SNAPSHOT && destData.getObjectType() == DataObjectType.SNAPSHOT &&
- srcData.getDataStore().getRole() == DataStoreRole.Primary) {
+ srcData.getDataStore().getRole() == DataStoreRole.Primary) {
return processor.backupSnapshot(cmd);
} else if (srcData.getObjectType() == DataObjectType.SNAPSHOT && destData.getObjectType() == DataObjectType.VOLUME) {
return processor.createVolumeFromSnapshot(cmd);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/template/HttpTemplateDownloader.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/HttpTemplateDownloader.java b/core/src/com/cloud/storage/template/HttpTemplateDownloader.java
index 2a6547a..f3d34b0 100644
--- a/core/src/com/cloud/storage/template/HttpTemplateDownloader.java
+++ b/core/src/com/cloud/storage/template/HttpTemplateDownloader.java
@@ -39,6 +39,7 @@ import org.apache.commons.httpclient.auth.AuthScope;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.params.HttpMethodParams;
import org.apache.log4j.Logger;
+
import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.cloudstack.storage.command.DownloadCommand.ResourceType;
@@ -75,8 +76,8 @@ public class HttpTemplateDownloader extends ManagedContextRunnable implements Te
private ResourceType resourceType = ResourceType.TEMPLATE;
private final HttpMethodRetryHandler myretryhandler;
- public HttpTemplateDownloader(StorageLayer storageLayer, String downloadUrl, String toDir, DownloadCompleteCallback callback, long maxTemplateSizeInBytes, String user,
- String password, Proxy proxy, ResourceType resourceType) {
+ public HttpTemplateDownloader(StorageLayer storageLayer, String downloadUrl, String toDir, DownloadCompleteCallback callback, long maxTemplateSizeInBytes,
+ String user, String password, Proxy proxy, ResourceType resourceType) {
_storage = storageLayer;
this.downloadUrl = downloadUrl;
setToDir(toDir);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/template/IsoProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/IsoProcessor.java b/core/src/com/cloud/storage/template/IsoProcessor.java
index ede21ce..2dbfb48 100644
--- a/core/src/com/cloud/storage/template/IsoProcessor.java
+++ b/core/src/com/cloud/storage/template/IsoProcessor.java
@@ -24,8 +24,8 @@ import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
-import com.cloud.storage.StorageLayer;
import com.cloud.storage.Storage.ImageFormat;
+import com.cloud.storage.StorageLayer;
import com.cloud.utils.component.AdapterBase;
@Local(value = Processor.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/template/Processor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/Processor.java b/core/src/com/cloud/storage/template/Processor.java
index 3d137dc..4887e4e 100644
--- a/core/src/com/cloud/storage/template/Processor.java
+++ b/core/src/com/cloud/storage/template/Processor.java
@@ -16,12 +16,12 @@
// under the License.
package com.cloud.storage.template;
+import java.io.File;
+
import com.cloud.exception.InternalErrorException;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.utils.component.Adapter;
-import java.io.File;
-
/**
* Generic interface to process different types of image formats
* for templates downloaded and for conversion from one format
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/template/QCOW2Processor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/QCOW2Processor.java b/core/src/com/cloud/storage/template/QCOW2Processor.java
index e5f232f..b3c0cc9 100644
--- a/core/src/com/cloud/storage/template/QCOW2Processor.java
+++ b/core/src/com/cloud/storage/template/QCOW2Processor.java
@@ -81,6 +81,7 @@ public class QCOW2Processor extends AdapterBase implements Processor {
return info;
}
+ @Override
public Long getVirtualSize(File file) {
FileInputStream strm = null;
byte[] b = new byte[8];
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/template/S3TemplateDownloader.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/S3TemplateDownloader.java b/core/src/com/cloud/storage/template/S3TemplateDownloader.java
index a111013..21b7a59 100644
--- a/core/src/com/cloud/storage/template/S3TemplateDownloader.java
+++ b/core/src/com/cloud/storage/template/S3TemplateDownloader.java
@@ -215,7 +215,7 @@ public class S3TemplateDownloader extends ManagedContextRunnable implements Temp
InputStream in = !chunked ? new BufferedInputStream(request.getResponseBodyAsStream()) : new ChunkedInputStream(request.getResponseBodyAsStream());
s_logger.info("Starting download from " + getDownloadUrl() + " to s3 bucket " + s3.getBucketName() + " remoteSize=" + remoteSize + " , max size=" +
- maxTemplateSizeInByte);
+ maxTemplateSizeInByte);
Date start = new Date();
// compute s3 key
@@ -261,7 +261,7 @@ public class S3TemplateDownloader extends ManagedContextRunnable implements Temp
// single part upload, with 5GB limit in Amazon
S3Utils.putObject(s3, putObjectRequest);
while (status != TemplateDownloader.Status.DOWNLOAD_FINISHED && status != TemplateDownloader.Status.UNRECOVERABLE_ERROR &&
- status != TemplateDownloader.Status.ABORTED) {
+ status != TemplateDownloader.Status.ABORTED) {
// wait for completion
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/template/TemplateDownloaderBase.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/TemplateDownloaderBase.java b/core/src/com/cloud/storage/template/TemplateDownloaderBase.java
index 466958d..7eb0b5f 100644
--- a/core/src/com/cloud/storage/template/TemplateDownloaderBase.java
+++ b/core/src/com/cloud/storage/template/TemplateDownloaderBase.java
@@ -18,9 +18,10 @@ package com.cloud.storage.template;
import java.io.File;
-import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+
import com.cloud.storage.StorageLayer;
public abstract class TemplateDownloaderBase extends ManagedContextRunnable implements TemplateDownloader {
@@ -119,6 +120,7 @@ public abstract class TemplateDownloaderBase extends ManagedContextRunnable impl
return true;
}
+ @Override
public long getMaxTemplateSizeInBytes() {
return this.MAX_TEMPLATE_SIZE_IN_BYTES;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/template/TemplateLocation.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/TemplateLocation.java b/core/src/com/cloud/storage/template/TemplateLocation.java
index b97ff76..48b040a 100644
--- a/core/src/com/cloud/storage/template/TemplateLocation.java
+++ b/core/src/com/cloud/storage/template/TemplateLocation.java
@@ -24,9 +24,10 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.Properties;
-import org.apache.cloudstack.storage.command.DownloadCommand.ResourceType;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.storage.command.DownloadCommand.ResourceType;
+
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.StorageLayer;
import com.cloud.storage.template.Processor.FormatInfo;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/template/VhdProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/VhdProcessor.java b/core/src/com/cloud/storage/template/VhdProcessor.java
index e0fdb35..308ea64 100644
--- a/core/src/com/cloud/storage/template/VhdProcessor.java
+++ b/core/src/com/cloud/storage/template/VhdProcessor.java
@@ -25,7 +25,6 @@ import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
-import com.cloud.utils.exception.CloudRuntimeException;
import org.apache.log4j.Logger;
import com.cloud.exception.InternalErrorException;
@@ -33,6 +32,7 @@ import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.StorageLayer;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.AdapterBase;
+import com.cloud.utils.exception.CloudRuntimeException;
/**
* VhdProcessor processes the downloaded template for VHD. It
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/template/VmdkProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/VmdkProcessor.java b/core/src/com/cloud/storage/template/VmdkProcessor.java
index 92c0ce6..be20143 100644
--- a/core/src/com/cloud/storage/template/VmdkProcessor.java
+++ b/core/src/com/cloud/storage/template/VmdkProcessor.java
@@ -22,9 +22,10 @@ import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.apache.log4j.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.log4j.Logger;
import com.cloud.exception.InternalErrorException;
import com.cloud.storage.Storage.ImageFormat;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java b/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java
index 21fedf9..01c05f0 100644
--- a/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java
+++ b/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java
@@ -17,7 +17,6 @@
package org.apache.cloudstack.storage.to;
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore;
-import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo;
import com.cloud.agent.api.to.DataStoreTO;
import com.cloud.storage.DataStoreRole;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java b/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
index a46351b..03b4609 100644
--- a/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
+++ b/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
@@ -17,12 +17,12 @@
package org.apache.cloudstack.storage.to;
import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
import com.cloud.agent.api.to.DataObjectType;
import com.cloud.agent.api.to.DataStoreTO;
import com.cloud.agent.api.to.DataTO;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
public class SnapshotObjectTO implements DataTO {
private String path;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java b/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java
index f25cc71..b201c38 100644
--- a/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java
+++ b/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java
@@ -16,12 +16,12 @@
// under the License.
package org.apache.cloudstack.storage.to;
-import com.cloud.hypervisor.Hypervisor;
import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo;
import com.cloud.agent.api.to.DataObjectType;
import com.cloud.agent.api.to.DataStoreTO;
import com.cloud.agent.api.to.DataTO;
+import com.cloud.hypervisor.Hypervisor;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.template.VirtualMachineTemplate;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java b/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java
index b8c7faa..4499049 100644
--- a/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java
+++ b/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java
@@ -16,12 +16,12 @@
// under the License.
package org.apache.cloudstack.storage.to;
-import com.cloud.hypervisor.Hypervisor;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
import com.cloud.agent.api.to.DataObjectType;
import com.cloud.agent.api.to.DataStoreTO;
import com.cloud.agent.api.to.DataTO;
+import com.cloud.hypervisor.Hypervisor;
import com.cloud.storage.Storage;
import com.cloud.storage.Volume;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/test/com/cloud/network/HAProxyConfiguratorTest.java
----------------------------------------------------------------------
diff --git a/core/test/com/cloud/network/HAProxyConfiguratorTest.java b/core/test/com/cloud/network/HAProxyConfiguratorTest.java
index 2e6cb45..33cf50b 100644
--- a/core/test/com/cloud/network/HAProxyConfiguratorTest.java
+++ b/core/test/com/cloud/network/HAProxyConfiguratorTest.java
@@ -16,14 +16,13 @@
// under the License.
package com.cloud.network;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.mockito.Mockito;
import com.cloud.agent.api.routing.LoadBalancerConfigCommand;
import com.cloud.agent.api.to.LoadBalancerTO;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java
index 6aaa00b..4411c47 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java
@@ -36,8 +36,9 @@ public class BackupSnapshotAnswerTest {
StoragePool pool = Mockito.mock(StoragePool.class);
- bsc = new BackupSnapshotCommand("secondaryStoragePoolURL", 101L, 102L, 103L, 104L, 105L, "volumePath", pool, "snapshotUuid", "snapshotName", "prevSnapshotUuid",
- "prevBackupUuid", false, "vmName", 5);
+ bsc =
+ new BackupSnapshotCommand("secondaryStoragePoolURL", 101L, 102L, 103L, 104L, 105L, "volumePath", pool, "snapshotUuid", "snapshotName", "prevSnapshotUuid",
+ "prevBackupUuid", false, "vmName", 5);
bsa = new BackupSnapshotAnswer(bsc, true, "results", "bussname", false);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java
index 3b66c67..eaa9b94 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java
@@ -148,11 +148,11 @@ public class BackupSnapshotCommandTest {
};
};
- BackupSnapshotCommand bsc = new BackupSnapshotCommand("http://secondary.Storage.Url", 101L, 102L, 103L, 104L, 105L, "vPath", pool, "420fa39c-4ef1-a83c-fd93-46dc1ff515ae",
- "sName", "9012793e-0657-11e2-bebc-0050568b0057", "7167e0b2-f5b0-11e1-8414-0050568b0057", false, "vmName", 5);
+ BackupSnapshotCommand bsc = new BackupSnapshotCommand("http://secondary.Storage.Url", 101L, 102L, 103L, 104L, 105L, "vPath", pool,
+ "420fa39c-4ef1-a83c-fd93-46dc1ff515ae", "sName", "9012793e-0657-11e2-bebc-0050568b0057", "7167e0b2-f5b0-11e1-8414-0050568b0057", false, "vmName", 5);
- BackupSnapshotCommand bsc1 = new BackupSnapshotCommand("http://secondary.Storage.Url", 101L, 102L, 103L, 104L, 105L, "vPath", pool, "420fa39c-4ef1-a83c-fd93-46dc1ff515ae",
- "sName", "9012793e-0657-11e2-bebc-0050568b0057", "7167e0b2-f5b0-11e1-8414-0050568b0057", false, "vmName", 5);
+ BackupSnapshotCommand bsc1 = new BackupSnapshotCommand("http://secondary.Storage.Url", 101L, 102L, 103L, 104L, 105L, "vPath", pool,
+ "420fa39c-4ef1-a83c-fd93-46dc1ff515ae", "sName", "9012793e-0657-11e2-bebc-0050568b0057", "7167e0b2-f5b0-11e1-8414-0050568b0057", false, "vmName", 5);
@Test
public void testGetSecondaryStorageUrl() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java
index ac9efb1..b0872bf 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java
@@ -20,21 +20,21 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import com.cloud.agent.api.storage.ResizeVolumeCommand;
-import com.cloud.agent.api.to.StorageFilerTO;
-import com.cloud.storage.Storage;
-import com.cloud.storage.StoragePool;
-import com.cloud.storage.StoragePoolStatus;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import com.cloud.agent.api.CheckNetworkAnswer;
import com.cloud.agent.api.CheckNetworkCommand;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import com.cloud.agent.api.storage.ResizeVolumeCommand;
+import com.cloud.agent.api.to.StorageFilerTO;
+import com.cloud.storage.Storage;
+import com.cloud.storage.StoragePool;
+import com.cloud.storage.StoragePoolStatus;
public class CheckNetworkAnswerTest {
CheckNetworkCommand cnc;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
index 1934210..d266eb3 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
@@ -35,10 +35,12 @@ import com.cloud.resource.ResourceState;
public class CheckOnHostCommandTest {
public Host host = new Host() {
+ @Override
public Status getState() {
return Status.Up;
};
+ @Override
public long getId() {
return 101L;
};
@@ -48,14 +50,17 @@ public class CheckOnHostCommandTest {
return "101";
}
+ @Override
public String getName() {
return "hostName";
};
+ @Override
public Type getType() {
return Host.Type.Storage;
};
+ @Override
public Date getCreated() {
Date date = null;
try {
@@ -66,62 +71,77 @@ public class CheckOnHostCommandTest {
return date;
}
+ @Override
public Status getStatus() {
return Status.Up;
};
+ @Override
public String getPrivateIpAddress() {
return "10.1.1.1";
};
+ @Override
public String getStorageIpAddress() {
return "10.1.1.2";
};
+ @Override
public String getGuid() {
return "bed9f83e-cac3-11e1-ac8a-0050568b007e";
};
+ @Override
public Long getTotalMemory() {
return 100000000000L;
}
+ @Override
public Integer getCpuSockets() {
return 1;
};
+ @Override
public Integer getCpus() {
return 16;
};
+ @Override
public Long getSpeed() {
return 2000000000L;
};
+ @Override
public Integer getProxyPort() {
return 22;
};
+ @Override
public Long getPodId() {
return 16L;
};
+ @Override
public long getDataCenterId() {
return 17L;
};
+ @Override
public String getParent() {
return "parent";
};
+ @Override
public String getStorageIpAddressDeux() {
return "10.1.1.3";
};
+ @Override
public HypervisorType getHypervisorType() {
return HypervisorType.XenServer;
};
+ @Override
public Date getDisconnectedOn() {
Date date = null;
try {
@@ -132,26 +152,32 @@ public class CheckOnHostCommandTest {
return date;
}
+ @Override
public String getVersion() {
return "4.0.1";
};
+ @Override
public long getTotalSize() {
return 100000000000L;
};
+ @Override
public String getCapabilities() {
return "capabilities";
};
+ @Override
public long getLastPinged() {
return 1L;
};
+ @Override
public Long getManagementServerId() {
return 2L;
};
+ @Override
public Date getRemoved() {
Date date = null;
try {
@@ -162,54 +188,67 @@ public class CheckOnHostCommandTest {
return date;
};
+ @Override
public Long getClusterId() {
return 3L;
};
+ @Override
public String getPublicIpAddress() {
return "10.1.1.4";
};
+ @Override
public String getPublicNetmask() {
return "255.255.255.8";
};
+ @Override
public String getPrivateNetmask() {
return "255.255.255.16";
};
+ @Override
public String getStorageNetmask() {
return "255.255.255.24";
};
+ @Override
public String getStorageMacAddress() {
return "01:f4:17:38:0e:26";
};
+ @Override
public String getPublicMacAddress() {
return "02:f4:17:38:0e:26";
};
+ @Override
public String getPrivateMacAddress() {
return "03:f4:17:38:0e:26";
};
+ @Override
public String getStorageNetmaskDeux() {
return "255.255.255.25";
};
+ @Override
public String getStorageMacAddressDeux() {
return "01:f4:17:38:0e:27";
};
+ @Override
public String getHypervisorVersion() {
return "1.2.3.0";
};
+ @Override
public boolean isInMaintenanceStates() {
return false;
};
+ @Override
public ResourceState getResourceState() {
return ResourceState.Enabled;
};
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java
index c915229..8339a98 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java
@@ -35,22 +35,27 @@ import com.cloud.storage.StoragePoolStatus;
public class SnapshotCommandTest {
public StoragePool pool = new StoragePool() {
+ @Override
public long getId() {
return 1L;
};
+ @Override
public String getName() {
return "name";
};
+ @Override
public String getUuid() {
return "bed9f83e-cac3-11e1-ac8a-0050568b007e";
};
+ @Override
public StoragePoolType getPoolType() {
return StoragePoolType.Filesystem;
};
+ @Override
public Date getCreated() {
Date date = null;
try {
@@ -61,58 +66,72 @@ public class SnapshotCommandTest {
return date;
}
+ @Override
public Date getUpdateTime() {
return new Date();
};
+ @Override
public long getDataCenterId() {
return 0L;
};
+ @Override
public long getCapacityBytes() {
return 0L;
};
+ @Override
public long getUsedBytes() {
return 0L;
};
+ @Override
public Long getCapacityIops() {
return 0L;
};
+ @Override
public Long getClusterId() {
return 0L;
};
+ @Override
public String getHostAddress() {
return "hostAddress";
};
+ @Override
public String getPath() {
return "path";
};
+ @Override
public String getUserInfo() {
return "userInfo";
};
+ @Override
public boolean isShared() {
return false;
};
+ @Override
public boolean isLocal() {
return false;
};
+ @Override
public StoragePoolStatus getStatus() {
return StoragePoolStatus.Up;
};
+ @Override
public int getPort() {
return 25;
};
+ @Override
public Long getPodId() {
return 0L;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/com/cloud/vm/VirtualMachineManager.java
----------------------------------------------------------------------
diff --git a/engine/api/src/com/cloud/vm/VirtualMachineManager.java b/engine/api/src/com/cloud/vm/VirtualMachineManager.java
index 18aaafe..6757870 100644
--- a/engine/api/src/com/cloud/vm/VirtualMachineManager.java
+++ b/engine/api/src/com/cloud/vm/VirtualMachineManager.java
@@ -50,7 +50,7 @@ import com.cloud.utils.fsm.NoTransitionException;
public interface VirtualMachineManager extends Manager {
static final ConfigKey<Boolean> ExecuteInSequence = new ConfigKey<Boolean>("Advanced", Boolean.class, "execute.in.sequence.hypervisor.commands", "false",
"If set to true, StartCommand, StopCommand, CopyCommand will be synchronized on the agent side."
- + " If set to false, these commands become asynchronous. Default value is false.", true);
+ + " If set to false, these commands become asynchronous. Default value is false.", true);
public interface Topics {
public static final String VM_POWER_STATE = "vm.powerstate";
@@ -78,8 +78,8 @@ public interface VirtualMachineManager extends Manager {
LinkedHashMap<? extends DiskOffering, Long> dataDiskOfferings, LinkedHashMap<? extends Network, ? extends NicProfile> auxiliaryNetworks, DeploymentPlan plan,
HypervisorType hyperType) throws InsufficientCapacityException;
- void allocate(String vmInstanceName, VirtualMachineTemplate template, ServiceOffering serviceOffering, LinkedHashMap<? extends Network, ? extends NicProfile> networkProfiles,
- DeploymentPlan plan, HypervisorType hyperType) throws InsufficientCapacityException;
+ void allocate(String vmInstanceName, VirtualMachineTemplate template, ServiceOffering serviceOffering,
+ LinkedHashMap<? extends Network, ? extends NicProfile> networkProfiles, DeploymentPlan plan, HypervisorType hyperType) throws InsufficientCapacityException;
void start(String vmUuid, Map<VirtualMachineProfile.Param, Object> params);
@@ -109,7 +109,8 @@ public interface VirtualMachineManager extends Manager {
void migrate(String vmUuid, long srcHostId, DeployDestination dest) throws ResourceUnavailableException, ConcurrentOperationException;
- void migrateWithStorage(String vmUuid, long srcId, long destId, Map<Volume, StoragePool> volumeToPool) throws ResourceUnavailableException, ConcurrentOperationException;
+ void migrateWithStorage(String vmUuid, long srcId, long destId, Map<Volume, StoragePool> volumeToPool) throws ResourceUnavailableException,
+ ConcurrentOperationException;
void reboot(String vmUuid, Map<VirtualMachineProfile.Param, Object> params) throws InsufficientCapacityException, ResourceUnavailableException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java b/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java
index e416503..773c683 100755
--- a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java
+++ b/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java
@@ -90,7 +90,8 @@ public interface VirtualMachineEntity extends CloudStackEntity {
* @param exclude list of areas to exclude
* @return a reservation id
*/
- String reserve(String plannerToUse, @BeanParam DeploymentPlan plan, ExcludeList exclude, String caller) throws InsufficientCapacityException, ResourceUnavailableException;
+ String reserve(String plannerToUse, @BeanParam DeploymentPlan plan, ExcludeList exclude, String caller) throws InsufficientCapacityException,
+ ResourceUnavailableException;
/**
* Migrate this VM to a certain destination.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java
index efdb675..bc532c3 100755
--- a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java
+++ b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java
@@ -19,7 +19,6 @@
package org.apache.cloudstack.engine.datacenter.entity.api;
import javax.ws.rs.GET;
-
import javax.ws.rs.POST;
import javax.ws.rs.Produces;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntity.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntity.java b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntity.java
index f5c9553..059b330 100755
--- a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntity.java
+++ b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntity.java
@@ -20,7 +20,6 @@ package org.apache.cloudstack.engine.datacenter.entity.api;
import java.util.List;
-import com.cloud.dc.Pod;
import com.cloud.org.Cluster;
import com.cloud.org.Grouping.AllocationState;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java b/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java
index d36cd79..7891b90 100755
--- a/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java
+++ b/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Map;
import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
/**
* All entities returned by the Cloud Orchestration Platform must implement
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
index ee28f3c..fc196e2 100755
--- a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
+++ b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
@@ -74,9 +74,11 @@ public interface NetworkOrchestrationService {
throws ConcurrentOperationException;
List<? extends Network> setupNetwork(Account owner, NetworkOffering offering, Network predefined, DeploymentPlan plan, String name, String displayText,
- boolean errorIfAlreadySetup, Long domainId, ACLType aclType, Boolean subdomainAccess, Long vpcId, Boolean isDisplayNetworkEnabled) throws ConcurrentOperationException;
+ boolean errorIfAlreadySetup, Long domainId, ACLType aclType, Boolean subdomainAccess, Long vpcId, Boolean isDisplayNetworkEnabled)
+ throws ConcurrentOperationException;
- void allocate(VirtualMachineProfile vm, LinkedHashMap<? extends Network, ? extends NicProfile> networks) throws InsufficientCapacityException, ConcurrentOperationException;
+ void allocate(VirtualMachineProfile vm, LinkedHashMap<? extends Network, ? extends NicProfile> networks) throws InsufficientCapacityException,
+ ConcurrentOperationException;
void prepare(VirtualMachineProfile profile, DeployDestination dest, ReservationContext context) throws InsufficientCapacityException, ConcurrentOperationException,
ResourceUnavailableException;
@@ -89,8 +91,8 @@ public interface NetworkOrchestrationService {
List<NicProfile> getNicProfiles(VirtualMachine vm);
- Pair<? extends NetworkGuru, ? extends Network> implementNetwork(long networkId, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException,
- ResourceUnavailableException, InsufficientCapacityException;
+ Pair<? extends NetworkGuru, ? extends Network> implementNetwork(long networkId, DeployDestination dest, ReservationContext context)
+ throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
/**
* prepares vm nic change for migration
@@ -191,8 +193,8 @@ public interface NetworkOrchestrationService {
boolean shutdownNetworkElementsAndResources(ReservationContext context, boolean b, Network network);
- void implementNetworkElementsAndResources(DeployDestination dest, ReservationContext context, Network network, NetworkOffering findById) throws ConcurrentOperationException,
- InsufficientAddressCapacityException, ResourceUnavailableException, InsufficientCapacityException;
+ void implementNetworkElementsAndResources(DeployDestination dest, ReservationContext context, Network network, NetworkOffering findById)
+ throws ConcurrentOperationException, InsufficientAddressCapacityException, ResourceUnavailableException, InsufficientCapacityException;
Map<String, String> finalizeServicesAndProvidersForNetwork(NetworkOffering offering, Long physicalNetworkId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
index a7df437..7379ed6 100644
--- a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
+++ b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
@@ -52,8 +52,8 @@ import com.cloud.vm.VirtualMachineProfile;
* to provision volumes.
*/
public interface VolumeOrchestrationService {
- VolumeInfo moveVolume(VolumeInfo volume, long destPoolDcId, Long destPoolPodId, Long destPoolClusterId, HypervisorType dataDiskHyperType) throws ConcurrentOperationException,
- StorageUnavailableException;
+ VolumeInfo moveVolume(VolumeInfo volume, long destPoolDcId, Long destPoolPodId, Long destPoolClusterId, HypervisorType dataDiskHyperType)
+ throws ConcurrentOperationException, StorageUnavailableException;
Volume allocateDuplicateVolume(Volume oldVol, Long templateId);
@@ -87,7 +87,8 @@ public interface VolumeOrchestrationService {
boolean canVmRestartOnAnotherServer(long vmId);
- DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering offering, Long rootDisksize, VirtualMachineTemplate template, VirtualMachine vm, Account owner);
+ DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering offering, Long rootDisksize, VirtualMachineTemplate template, VirtualMachine vm,
+ Account owner);
String getVmNameFromVolumeId(long volumeId);
[46/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
index ab6a27c..592b828 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
@@ -16,12 +16,13 @@
// under the License.
package org.apache.cloudstack.api.command.admin.user;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.UserResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.UserAccount;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java
index f22ffe7..41d6acd 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.command.admin.user;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListAccountResourcesCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.UserResponse;
-import org.apache.log4j.Logger;
@APICommand(name = "listUsers", description = "Lists user accounts", responseObject = UserResponse.class)
public class ListUsersCmd extends BaseListAccountResourcesCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java
index 1e3dded..9533004 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.user;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.UserResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
import com.cloud.user.User;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java
index 076e30f..facdc87 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.command.admin.user;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.RegisterResponse;
import org.apache.cloudstack.api.response.UserResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
import com.cloud.user.User;
@@ -54,6 +55,7 @@ public class RegisterCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
+ @Override
public String getCommandName() {
return s_name;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
index 87ddeae..de6e550 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.user;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.UserResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
-
import com.cloud.user.Account;
import com.cloud.user.User;
import com.cloud.user.UserAccount;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
index 1099af0..dbaac6e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vlan;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -29,7 +31,6 @@ import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.VlanIpRangeResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.dc.Vlan;
import com.cloud.exception.ConcurrentOperationException;
@@ -48,7 +49,9 @@ public class CreateVlanIpRangeCmd extends BaseCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "account who will own the VLAN. If VLAN is Zone wide, this parameter should be ommited")
+ @Parameter(name = ApiConstants.ACCOUNT,
+ type = CommandType.STRING,
+ description = "account who will own the VLAN. If VLAN is Zone wide, this parameter should be ommited")
private String accountName;
@Parameter(name = ApiConstants.PROJECT_ID,
@@ -82,7 +85,7 @@ public class CreateVlanIpRangeCmd extends BaseCmd {
private String startIp;
@Parameter(name = ApiConstants.VLAN, type = CommandType.STRING, description = "the ID or VID of the VLAN. If not specified,"
- + " will be defaulted to the vlan of the network or if vlan of the network is null - to Untagged")
+ + " will be defaulted to the vlan of the network or if vlan of the network is null - to Untagged")
private String vlan;
@Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "the Zone ID of the VLAN IP range")
@@ -101,7 +104,7 @@ public class CreateVlanIpRangeCmd extends BaseCmd {
private String endIpv6;
@Parameter(name = ApiConstants.IP6_GATEWAY, type = CommandType.STRING, description = "the gateway of the IPv6 network. Required "
- + "for Shared networks and Isolated networks when it belongs to VPC")
+ + "for Shared networks and Isolated networks when it belongs to VPC")
private String ip6Gateway;
@Parameter(name = ApiConstants.IP6_CIDR, type = CommandType.STRING, description = "the CIDR of IPv6 network, must be at least /64")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java
index f52c8d7..2650482 100755
--- a/api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vlan;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -25,8 +27,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.VlanIpRangeResponse;
-import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.dc.Vlan;
import com.cloud.exception.ResourceAllocationException;
@@ -52,7 +52,11 @@ public class DedicatePublicIpRangeCmd extends BaseCmd {
@Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "project who will own the VLAN")
private Long projectId;
- @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, required = true, description = "domain ID of the account owning a VLAN")
+ @Parameter(name = ApiConstants.DOMAIN_ID,
+ type = CommandType.UUID,
+ entityType = DomainResponse.class,
+ required = true,
+ description = "domain ID of the account owning a VLAN")
private Long domainId;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java
index 65b1aef..8d29130 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vlan;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.VlanIpRangeResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
index 7fede44..f629af8 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.vlan;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -31,7 +33,6 @@ import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.VlanIpRangeResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.dc.Vlan;
import com.cloud.utils.Pair;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java
index 88b7c7e..2c160be 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vlan;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.VlanIpRangeResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
index 3419a4d..e85c288 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
@@ -18,18 +18,18 @@ package org.apache.cloudstack.api.command.admin.vm;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.command.user.vm.DeployVMCmd;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
@@ -47,7 +47,11 @@ public class AssignVMCmd extends BaseCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, required = true, description = "id of the VM to be moved")
+ @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
+ type = CommandType.UUID,
+ entityType = UserVmResponse.class,
+ required = true,
+ description = "id of the VM to be moved")
private Long virtualMachineId;
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, required = true, description = "account name of the new VM owner.")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
index 6a8596e..7b16686 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vm;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
@@ -86,10 +87,12 @@ public class ExpungeVMCmd extends BaseAsyncCmd {
return "Expunging vm: " + getId();
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.VirtualMachine;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
index 7b88dfd..3706d50 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vm;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InvalidParameterValueException;
@@ -60,7 +60,11 @@ public class MigrateVMCmd extends BaseAsyncCmd {
description = "Destination Host ID to migrate VM to. Required for live migrating a VM from host to host")
private Long hostId;
- @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, required = true, description = "the ID of the virtual machine")
+ @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
+ type = CommandType.UUID,
+ entityType = UserVmResponse.class,
+ required = true,
+ description = "the ID of the virtual machine")
private Long virtualMachineId;
@Parameter(name = ApiConstants.STORAGE_ID,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java
index 3d9848c..90918bf 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java
@@ -21,16 +21,16 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.cloudstack.api.*;
-
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.BaseCmd.CommandType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.HostResponse;
-import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.cloudstack.context.CallContext;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
@@ -39,12 +39,13 @@ import com.cloud.exception.ManagementServerException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.exception.VirtualMachineMigrationException;
import com.cloud.host.Host;
-import com.cloud.storage.StoragePool;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
import com.cloud.vm.VirtualMachine;
-@APICommand(name = "migrateVirtualMachineWithVolume", description = "Attempts Migration of a VM with its volumes to a different host", responseObject = UserVmResponse.class)
+@APICommand(name = "migrateVirtualMachineWithVolume",
+ description = "Attempts Migration of a VM with its volumes to a different host",
+ responseObject = UserVmResponse.class)
public class MigrateVirtualMachineWithVolumeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(MigrateVMCmd.class.getName());
@@ -54,13 +55,24 @@ public class MigrateVirtualMachineWithVolumeCmd extends BaseAsyncCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.HOST_ID, type = CommandType.UUID, entityType = HostResponse.class, required = true, description = "Destination Host ID to migrate VM to.")
+ @Parameter(name = ApiConstants.HOST_ID,
+ type = CommandType.UUID,
+ entityType = HostResponse.class,
+ required = true,
+ description = "Destination Host ID to migrate VM to.")
private Long hostId;
- @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, required = true, description = "the ID of the virtual machine")
+ @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
+ type = CommandType.UUID,
+ entityType = UserVmResponse.class,
+ required = true,
+ description = "the ID of the virtual machine")
private Long virtualMachineId;
- @Parameter(name = ApiConstants.MIGRATE_TO, type = CommandType.MAP, required = false, description = "Map of pool to which each volume should be migrated (volume/pool pair)")
+ @Parameter(name = ApiConstants.MIGRATE_TO,
+ type = CommandType.MAP,
+ required = false,
+ description = "Map of pool to which each volume should be migrated (volume/pool pair)")
private Map migrateVolumeTo;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java
index 52f34f8..abf5168 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vm;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
index f92511e..c3201f1 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
@@ -83,7 +83,8 @@ public class CreatePrivateGatewayCmd extends BaseAsyncCreateCmd {
@Parameter(name = ApiConstants.SOURCE_NAT_SUPPORTED,
type = CommandType.BOOLEAN,
required = false,
- description = "source NAT supported value. Default value false. If 'true' source NAT is enabled on the private gateway" + " 'false': sourcenat is not supported")
+ description = "source NAT supported value. Default value false. If 'true' source NAT is enabled on the private gateway"
+ + " 'false': sourcenat is not supported")
private Boolean isSourceNat;
@Parameter(name = ApiConstants.ACL_ID, type = CommandType.UUID, entityType = NetworkACLResponse.class, required = false, description = "the ID of the network ACL")
@@ -144,8 +145,9 @@ public class CreatePrivateGatewayCmd extends BaseAsyncCreateCmd {
public void create() throws ResourceAllocationException {
PrivateGateway result = null;
try {
- result = _vpcService.createVpcPrivateGateway(getVpcId(), getPhysicalNetworkId(), getBroadcastUri(), getStartIp(), getGateway(), getNetmask(), getEntityOwnerId(),
- getNetworkOfferingId(), getIsSourceNat(), getAclId());
+ result =
+ _vpcService.createVpcPrivateGateway(getVpcId(), getPhysicalNetworkId(), getBroadcastUri(), getStartIp(), getGateway(), getNetmask(), getEntityOwnerId(),
+ getNetworkOfferingId(), getIsSourceNat(), getAclId());
} catch (InsufficientCapacityException ex) {
s_logger.info(ex);
s_logger.trace(ex);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
index 6aec403..e3c0433 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
@@ -61,9 +61,8 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd {
description = "services supported by the vpc offering")
private List<String> supportedServices;
- @Parameter(name = ApiConstants.SERVICE_PROVIDER_LIST,
- type = CommandType.MAP,
- description = "provider to service mapping. " + "If not specified, the provider for the service will be mapped to the default provider on the physical network")
+ @Parameter(name = ApiConstants.SERVICE_PROVIDER_LIST, type = CommandType.MAP, description = "provider to service mapping. "
+ + "If not specified, the provider for the service will be mapped to the default provider on the physical network")
private Map<String, String> serviceProviderList;
@Parameter(name = ApiConstants.SERVICE_OFFERING_ID,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
index c3798ed..a5bb00c 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vpc;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.PrivateGatewayResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InvalidParameterValueException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java
index 70bff16..7abaa7d 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vpc;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.VpcOfferingResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
index 4b77dc5..05b6f9d 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vpc;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.VpcOfferingResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.network.vpc.VpcOffering;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java
index 9cce26a..0846102 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.zone;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.dc.DataCenter;
import com.cloud.user.Account;
@@ -68,7 +68,10 @@ public class CreateZoneCmd extends BaseCmd {
@Parameter(name = ApiConstants.DOMAIN, type = CommandType.STRING, description = "Network domain name for the networks in the zone")
private String domain;
- @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "the ID of the containing domain, null for public zones")
+ @Parameter(name = ApiConstants.DOMAIN_ID,
+ type = CommandType.UUID,
+ entityType = DomainResponse.class,
+ description = "the ID of the containing domain, null for public zones")
private Long domainId;
@Parameter(name = ApiConstants.NETWORK_TYPE, type = CommandType.STRING, required = true, description = "network type of the zone, can be Basic or Advanced")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java
index a107062..3e74625 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.zone;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.user.Account;
@APICommand(name = "deleteZone", description = "Deletes a Zone.", responseObject = SuccessResponse.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java
index 26d93e7..fe2bc6a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java
@@ -17,6 +17,8 @@
package org.apache.cloudstack.api.command.admin.zone;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -27,7 +29,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.AccountResponse;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java
index 25e13e2..f0074c5 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.zone;
import java.util.List;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -28,8 +30,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.dc.DataCenter;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
index adc4009..36df579 100644
--- a/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.account;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.projects.Project;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
index 64c20ec..f6aa36c 100644
--- a/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.account;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.projects.Project;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
index 9faae8c..bc93d21 100644
--- a/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.command.user.account;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListDomainResourcesCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.AccountResponse;
import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.log4j.Logger;
@APICommand(name = "listAccounts", description = "Lists accounts and provides detailed account information for listed accounts", responseObject = AccountResponse.class)
public class ListAccountsCmd extends BaseListDomainResourcesCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
index 1df341a..aa60016 100644
--- a/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.account;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ProjectAccountResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
index e06ba25..4df658b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
@@ -67,7 +67,10 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the account to associate with this IP address")
private String accountName;
- @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "the ID of the domain to associate with this IP address")
+ @Parameter(name = ApiConstants.DOMAIN_ID,
+ type = CommandType.UUID,
+ entityType = DomainResponse.class,
+ description = "the ID of the domain to associate with this IP address")
private Long domainId;
@Parameter(name = ApiConstants.ZONE_ID,
@@ -76,18 +79,21 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
description = "the ID of the availability zone you want to acquire an public IP address from")
private Long zoneId;
- @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "The network this ip address should be associated to.")
+ @Parameter(name = ApiConstants.NETWORK_ID,
+ type = CommandType.UUID,
+ entityType = NetworkResponse.class,
+ description = "The network this ip address should be associated to.")
private Long networkId;
@Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "Deploy vm for the project")
private Long projectId;
- @Parameter(name = ApiConstants.VPC_ID, type = CommandType.UUID, entityType = VpcResponse.class, description = "the VPC you want the ip address to " + "be associated with")
+ @Parameter(name = ApiConstants.VPC_ID, type = CommandType.UUID, entityType = VpcResponse.class, description = "the VPC you want the ip address to "
+ + "be associated with")
private Long vpcId;
- @Parameter(name = ApiConstants.IS_PORTABLE,
- type = BaseCmd.CommandType.BOOLEAN,
- description = "should be set to true " + "if public IP is required to be transferable across zones, if not specified defaults to false")
+ @Parameter(name = ApiConstants.IS_PORTABLE, type = BaseCmd.CommandType.BOOLEAN, description = "should be set to true "
+ + "if public IP is required to be transferable across zones, if not specified defaults to false")
private Boolean isPortable;
@Parameter(name = ApiConstants.REGION_ID,
@@ -168,7 +174,8 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
List<? extends Network> networks = _networkService.getIsolatedNetworksOwnedByAccountInZone(getZoneId(), _accountService.getAccount(getEntityOwnerId()));
if (networks.size() == 0) {
String domain = _domainService.getDomain(getDomainId()).getName();
- throw new InvalidParameterValueException("Account name=" + getAccountName() + " domain=" + domain + " doesn't have virtual networks in zone=" + zone.getName());
+ throw new InvalidParameterValueException("Account name=" + getAccountName() + " domain=" + domain + " doesn't have virtual networks in zone=" +
+ zone.getName());
}
if (networks.size() < 1) {
@@ -200,7 +207,8 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
if (project.getState() == Project.State.Active) {
return project.getProjectAccountId();
} else {
- throw new PermissionDeniedException("Can't add resources to the project with specified projectId in state=" + project.getState() + " as it's no longer active");
+ throw new PermissionDeniedException("Can't add resources to the project with specified projectId in state=" + project.getState() +
+ " as it's no longer active");
}
} else {
throw new InvalidParameterValueException("Unable to find project by id");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
index 6d581a9..e3669be 100644
--- a/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.address;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InsufficientAddressCapacityException;
import com.cloud.exception.InvalidParameterValueException;
@@ -47,7 +47,7 @@ public class DisassociateIPAddrCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = IPAddressResponse.class, required = true, description = "the id of the public ip address"
- + " to disassociate")
+ + " to disassociate")
private Long id;
// unexposed parameter needed for events logging
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
index 7b7a3a7..a5c54ad 100644
--- a/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.address;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -31,7 +33,6 @@ import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
import org.apache.cloudstack.api.response.VlanIpRangeResponse;
import org.apache.cloudstack.api.response.VpcResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.IpAddress;
import com.cloud.utils.Pair;
@@ -159,6 +160,7 @@ public class ListPublicIpAddressesCmd extends BaseListTaggedResourcesCmd {
this.setResponseObject(response);
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.IpAddress;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java
index 2dbe8d9..a2542a8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.affinitygroup;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.affinity.AffinityGroup;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.APICommand;
@@ -28,8 +30,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.user.Account;
@@ -47,7 +47,10 @@ public class CreateAffinityGroupCmd extends BaseAsyncCreateCmd {
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "an account for the affinity group. Must be used with domainId.")
private String accountName;
- @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, description = "domainId of the account owning the affinity group", entityType = DomainResponse.class)
+ @Parameter(name = ApiConstants.DOMAIN_ID,
+ type = CommandType.UUID,
+ description = "domainId of the account owning the affinity group",
+ entityType = DomainResponse.class)
private Long domainId;
@Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "optional description of the affinity group")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
index 512f40f..a6cf1bb 100644
--- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.affinitygroup;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
@@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.Account;
@@ -46,7 +46,10 @@ public class DeleteAffinityGroupCmd extends BaseAsyncCmd {
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the account of the affinity group. Must be specified with domain ID")
private String accountName;
- @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, description = "the domain ID of account owning the affinity group", entityType = DomainResponse.class)
+ @Parameter(name = ApiConstants.DOMAIN_ID,
+ type = CommandType.UUID,
+ description = "the domain ID of account owning the affinity group",
+ entityType = DomainResponse.class)
private Long domainId;
@Parameter(name = ApiConstants.ID,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java
index 2219e7d..87de7f7 100644
--- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java
@@ -19,11 +19,12 @@ package org.apache.cloudstack.api.command.user.affinitygroup;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.affinity.AffinityGroupTypeResponse;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
@@ -42,6 +43,7 @@ public class ListAffinityGroupTypesCmd extends BaseListCmd {
return s_name;
}
+ @Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
index 3c3e914..367dec9 100644
--- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.affinitygroup;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.BaseListAccountResourcesCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.log4j.Logger;
@APICommand(name = "listAffinityGroups", description = "Lists affinity groups", responseObject = AffinityGroupResponse.class)
public class ListAffinityGroupsCmd extends BaseListAccountResourcesCmd {
@@ -39,7 +40,10 @@ public class ListAffinityGroupsCmd extends BaseListAccountResourcesCmd {
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "lists affinity groups by name")
private String affinityGroupName;
- @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, description = "lists affinity groups by virtual machine id", entityType = UserVmResponse.class)
+ @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
+ type = CommandType.UUID,
+ description = "lists affinity groups by virtual machine id",
+ entityType = UserVmResponse.class)
private Long virtualMachineId;
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, description = "list the affinity group by the id provided", entityType = AffinityGroupResponse.class)
@@ -75,8 +79,9 @@ public class ListAffinityGroupsCmd extends BaseListAccountResourcesCmd {
@Override
public void execute() {
- ListResponse<AffinityGroupResponse> response = _queryService.listAffinityGroups(id, affinityGroupName, affinityGroupType, virtualMachineId, this.getAccountName(),
- this.getDomainId(), this.isRecursive(), this.listAll(), this.getStartIndex(), this.getPageSizeVal());
+ ListResponse<AffinityGroupResponse> response =
+ _queryService.listAffinityGroups(id, affinityGroupName, affinityGroupType, virtualMachineId, this.getAccountName(), this.getDomainId(), this.isRecursive(),
+ this.listAll(), this.getStartIndex(), this.getPageSizeVal());
response.setResponseName(getCommandName());
this.setResponseObject(response);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
index 45733ca..7bb1c5b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
@@ -20,21 +20,21 @@ import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiConstants.VMDetails;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.ApiConstants.VMDetails;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.InvalidParameterValueException;
@@ -44,7 +44,7 @@ import com.cloud.uservm.UserVm;
@APICommand(name = "updateVMAffinityGroup",
description = "Updates the affinity/anti-affinity group associations of a virtual machine. The VM has to be stopped and restarted for the "
- + "new properties to take effect.",
+ + "new properties to take effect.",
responseObject = UserVmResponse.class)
public class UpdateVMAffinityGroupCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpdateVMAffinityGroupCmd.class.getName());
@@ -64,7 +64,7 @@ public class UpdateVMAffinityGroupCmd extends BaseAsyncCmd {
collectionType = CommandType.UUID,
entityType = AffinityGroupResponse.class,
description = "comma separated list of affinity groups id that are going to be applied to the virtual machine. "
- + "Should be passed only when vm is created from a zone with Basic Network support." + " Mutually exclusive with securitygroupnames parameter")
+ + "Should be passed only when vm is created from a zone with Basic Network support." + " Mutually exclusive with securitygroupnames parameter")
private List<Long> affinityGroupIdList;
@ACL
@@ -73,7 +73,7 @@ public class UpdateVMAffinityGroupCmd extends BaseAsyncCmd {
collectionType = CommandType.STRING,
entityType = AffinityGroupResponse.class,
description = "comma separated list of affinity groups names that are going to be applied to the virtual machine."
- + " Should be passed only when vm is created from a zone with Basic Network support. " + "Mutually exclusive with securitygroupids parameter")
+ + " Should be passed only when vm is created from a zone with Basic Network support. " + "Mutually exclusive with securitygroupids parameter")
private List<String> affinityGroupNameList;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java
index efe1f3e..ce6dc68 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -27,7 +29,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.AutoScalePolicyResponse;
import org.apache.cloudstack.api.response.ConditionResponse;
-import org.apache.log4j.Logger;
import com.cloud.domain.Domain;
import com.cloud.event.EventTypes;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
index 2ea62c1..5547974 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -29,7 +31,6 @@ import org.apache.cloudstack.api.response.AutoScalePolicyResponse;
import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse;
import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse;
import org.apache.cloudstack.api.response.FirewallRuleResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
@@ -49,7 +50,11 @@ public class CreateAutoScaleVmGroupCmd extends BaseAsyncCreateCmd {
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.LBID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule")
+ @Parameter(name = ApiConstants.LBID,
+ type = CommandType.UUID,
+ entityType = FirewallRuleResponse.class,
+ required = true,
+ description = "the ID of the load balancer rule")
private long lbRuleId;
@Parameter(name = ApiConstants.MIN_MEMBERS,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
index 07c673b..bee1b22 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.HashMap;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -33,8 +35,6 @@ import org.apache.cloudstack.api.response.UserResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceAllocationException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java
index 08617ae..914848a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java
@@ -17,6 +17,8 @@
package org.apache.cloudstack.api.command.user.autoscale;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -29,8 +31,6 @@ import org.apache.cloudstack.api.response.CounterResponse;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.network.as.Condition;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
index 6e24b6d..1aedf57 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.autoscale;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.AutoScalePolicyResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScalePolicy;
import com.cloud.user.Account;
@@ -41,7 +41,11 @@ public class DeleteAutoScalePolicyCmd extends BaseAsyncCmd {
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = AutoScalePolicyResponse.class, required = true, description = "the ID of the autoscale policy")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = AutoScalePolicyResponse.class,
+ required = true,
+ description = "the ID of the autoscale policy")
private Long id;
// ///////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
index 5904346..a7823b4 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.autoscale;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScaleVmGroup;
import com.cloud.user.Account;
@@ -41,7 +41,11 @@ public class DeleteAutoScaleVmGroupCmd extends BaseAsyncCmd {
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = AutoScaleVmGroupResponse.class, required = true, description = "the ID of the autoscale group")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = AutoScaleVmGroupResponse.class,
+ required = true,
+ description = "the ID of the autoscale group")
private Long id;
// ///////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
index a299221..3d6d030 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.autoscale;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScaleVmProfile;
import com.cloud.user.Account;
@@ -41,7 +41,11 @@ public class DeleteAutoScaleVmProfileCmd extends BaseAsyncCmd {
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = AutoScaleVmProfileResponse.class, required = true, description = "the ID of the autoscale profile")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = AutoScaleVmProfileResponse.class,
+ required = true,
+ description = "the ID of the autoscale profile")
private Long id;
// ///////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
index c6c7fdc..0cc2319 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
@@ -17,6 +17,8 @@
package org.apache.cloudstack.api.command.user.autoscale;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ConditionResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceInUseException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java
index b4f7372..2bd6f87 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java
@@ -17,6 +17,8 @@
package org.apache.cloudstack.api.command.user.autoscale;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -25,7 +27,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScaleVmGroup;
@@ -40,7 +41,11 @@ public class DisableAutoScaleVmGroupCmd extends BaseAsyncCmd {
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = AutoScaleVmGroupResponse.class, required = true, description = "the ID of the autoscale group")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = AutoScaleVmGroupResponse.class,
+ required = true,
+ description = "the ID of the autoscale group")
private Long id;
// ///////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java
index 1a79cef..dc89f2b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java
@@ -17,6 +17,8 @@
package org.apache.cloudstack.api.command.user.autoscale;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -25,7 +27,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScaleVmGroup;
@@ -40,7 +41,11 @@ public class EnableAutoScaleVmGroupCmd extends BaseAsyncCmd {
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = AutoScaleVmGroupResponse.class, required = true, description = "the ID of the autoscale group")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = AutoScaleVmGroupResponse.class,
+ required = true,
+ description = "the ID of the autoscale group")
private Long id;
// ///////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java
index c910607..84ed30a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListAccountResourcesCmd;
@@ -27,7 +29,6 @@ import org.apache.cloudstack.api.response.AutoScalePolicyResponse;
import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse;
import org.apache.cloudstack.api.response.ConditionResponse;
import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.as.AutoScalePolicy;
@@ -47,7 +48,9 @@ public class ListAutoScalePoliciesCmd extends BaseListAccountResourcesCmd {
@Parameter(name = ApiConstants.CONDITION_ID, type = CommandType.UUID, entityType = ConditionResponse.class, description = "the ID of the condition of the policy")
private Long conditionId;
- @Parameter(name = ApiConstants.ACTION, type = CommandType.STRING, description = "the action to be executed if all the conditions evaluate to true for the specified duration.")
+ @Parameter(name = ApiConstants.ACTION,
+ type = CommandType.STRING,
+ description = "the action to be executed if all the conditions evaluate to true for the specified duration.")
private String action;
@Parameter(name = ApiConstants.VMGROUP_ID, type = CommandType.UUID, entityType = AutoScaleVmGroupResponse.class, description = "the ID of the autoscale vm group")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java
index 9c8e640..4eda7a8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
@@ -29,7 +31,6 @@ import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse;
import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.as.AutoScaleVmGroup;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
index 743210f..651f987 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.TemplateResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.as.AutoScaleVmProfile;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java
index f94ba0e..015f3ed 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java
@@ -17,7 +17,11 @@
package org.apache.cloudstack.api.command.user.autoscale;
-import com.cloud.network.as.Condition;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListAccountResourcesCmd;
@@ -26,10 +30,8 @@ import org.apache.cloudstack.api.response.AutoScalePolicyResponse;
import org.apache.cloudstack.api.response.ConditionResponse;
import org.apache.cloudstack.api.response.CounterResponse;
import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.log4j.Logger;
-import java.util.ArrayList;
-import java.util.List;
+import com.cloud.network.as.Condition;
@APICommand(name = "listConditions", description = "List Conditions for the specific user", responseObject = ConditionResponse.class)
public class ListConditionsCmd extends BaseListAccountResourcesCmd {
@@ -43,7 +45,11 @@ public class ListConditionsCmd extends BaseListAccountResourcesCmd {
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ConditionResponse.class, required = false, description = "ID of the Condition.")
private Long id;
- @Parameter(name = ApiConstants.COUNTER_ID, type = CommandType.UUID, entityType = CounterResponse.class, required = false, description = "Counter-id of the condition.")
+ @Parameter(name = ApiConstants.COUNTER_ID,
+ type = CommandType.UUID,
+ entityType = CounterResponse.class,
+ required = false,
+ description = "Counter-id of the condition.")
private Long counterId;
@Parameter(name = ApiConstants.POLICY_ID, type = CommandType.UUID, entityType = AutoScalePolicyResponse.class, description = "the ID of the policy")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java
index cfafb89..f503b2b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java
@@ -20,13 +20,14 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.CounterResponse;
import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.as.Counter;
import com.cloud.user.Account;
[27/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsInfoType.java b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsInfoType.java
index b8f4921..884ec72 100644
--- a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsInfoType.java
@@ -142,7 +142,8 @@ public class DescribePlacementGroupsInfoType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribePlacementGroupsInfoType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponse.java b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponse.java
index 0e221d0..73015e7 100644
--- a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribePlacementGroupsResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribePlacementGroupsResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribePlacementGroupsResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribePlacementGroupsResponse implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribePlacementGroupsResponse implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponseType.java b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponseType.java
index 6f0cb6f..15887ab 100644
--- a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponseType.java
@@ -125,7 +125,8 @@ public class DescribePlacementGroupsResponseType implements org.apache.axis2.dat
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribePlacementGroupsResponseType implements org.apache.axis2.dat
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsType.java b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsType.java
index c569e59..88e6311 100644
--- a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsType.java
@@ -139,7 +139,8 @@ public class DescribePlacementGroupsType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -198,9 +199,8 @@ public class DescribePlacementGroupsType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeRegions.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRegions.java b/awsapi/src/com/amazon/ec2/DescribeRegions.java
index be788e8..67b05ff 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRegions.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRegions.java
@@ -98,7 +98,8 @@ public class DescribeRegions implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeRegions implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeRegions implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeRegions").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeRegions").equals(reader.getName())) {
object.setDescribeRegions(com.amazon.ec2.DescribeRegionsType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeRegionsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRegionsResponse.java b/awsapi/src/com/amazon/ec2/DescribeRegionsResponse.java
index a9139a6..a323892 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRegionsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRegionsResponse.java
@@ -98,7 +98,8 @@ public class DescribeRegionsResponse implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeRegionsResponse implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeRegionsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRegionsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeRegionsResponseType.java
index f346f2a..1685858 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRegionsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRegionsResponseType.java
@@ -125,7 +125,8 @@ public class DescribeRegionsResponseType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeRegionsResponseType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeRegionsSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRegionsSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeRegionsSetItemType.java
index 208c75b..d86d8ce 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRegionsSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRegionsSetItemType.java
@@ -101,7 +101,8 @@ public class DescribeRegionsSetItemType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DescribeRegionsSetItemType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeRegionsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRegionsSetType.java b/awsapi/src/com/amazon/ec2/DescribeRegionsSetType.java
index 97f2e56..8a9b9d3 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRegionsSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRegionsSetType.java
@@ -142,7 +142,8 @@ public class DescribeRegionsSetType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeRegionsSetType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeRegionsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRegionsType.java b/awsapi/src/com/amazon/ec2/DescribeRegionsType.java
index 52dc3ec..d03cb93 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRegionsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRegionsType.java
@@ -139,7 +139,8 @@ public class DescribeRegionsType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -198,9 +199,8 @@ public class DescribeRegionsType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstances.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstances.java
index 28c025a..ed6226c 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstances.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstances.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeReservedInstances implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeReservedInstances", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME =
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeReservedInstances", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeReservedInstances implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeReservedInstances implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetItemType.java
index 1d97dc6..a6a2cb4 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetItemType.java
@@ -101,7 +101,8 @@ public class DescribeReservedInstancesListingSetItemType implements org.apache.a
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DescribeReservedInstancesListingSetItemType implements org.apache.a
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -391,7 +391,8 @@ public class DescribeReservedInstancesListingSetItemType implements org.apache.a
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingId").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingId").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetType.java
index 89192fd..4da650b 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetType.java
@@ -90,7 +90,8 @@ public class DescribeReservedInstancesListingSetType implements org.apache.axis2
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem);
list.add(param);
- this.localItem = (com.amazon.ec2.DescribeReservedInstancesListingSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesListingSetItemType[list.size()]);
+ this.localItem =
+ (com.amazon.ec2.DescribeReservedInstancesListingSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesListingSetItemType[list.size()]);
}
@@ -129,7 +130,8 @@ public class DescribeReservedInstancesListingSetType implements org.apache.axis2
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -195,9 +197,8 @@ public class DescribeReservedInstancesListingSetType implements org.apache.axis2
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListings.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListings.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListings.java
index 4454fca..3b7ac22 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListings.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListings.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeReservedInstancesListings implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeReservedInstancesListings", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "DescribeReservedInstancesListings", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeReservedInstancesListings implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeReservedInstancesListings implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponse.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponse.java
index d8ab00f..7803537 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponse.java
@@ -30,8 +30,8 @@ package com.amazon.ec2;
public class DescribeReservedInstancesListingsResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeReservedInstancesListingsResponse",
- "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "DescribeReservedInstancesListingsResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -99,7 +99,8 @@ public class DescribeReservedInstancesListingsResponse implements org.apache.axi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -119,9 +120,8 @@ public class DescribeReservedInstancesListingsResponse implements org.apache.axi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetItemType.java
index c4e41a2..4e42d76 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetItemType.java
@@ -345,7 +345,8 @@ public class DescribeReservedInstancesListingsResponseSetItemType implements org
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -380,7 +381,8 @@ public class DescribeReservedInstancesListingsResponseSetItemType implements org
java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/");
if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) {
- writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesListingsResponseSetItemType", xmlWriter);
+ writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesListingsResponseSetItemType",
+ xmlWriter);
} else {
writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeReservedInstancesListingsResponseSetItemType", xmlWriter);
}
@@ -634,9 +636,8 @@ public class DescribeReservedInstancesListingsResponseSetItemType implements org
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -914,7 +915,8 @@ public class DescribeReservedInstancesListingsResponseSetItemType implements org
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingId").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingId").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetType.java
index dc31144..c6f60b7 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetType.java
@@ -103,7 +103,8 @@ public class DescribeReservedInstancesListingsResponseSetType implements org.apa
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem);
list.add(param);
- this.localItem = (com.amazon.ec2.DescribeReservedInstancesListingsResponseSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesListingsResponseSetItemType[list.size()]);
+ this.localItem =
+ (com.amazon.ec2.DescribeReservedInstancesListingsResponseSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesListingsResponseSetItemType[list.size()]);
}
@@ -142,7 +143,8 @@ public class DescribeReservedInstancesListingsResponseSetType implements org.apa
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -177,7 +179,8 @@ public class DescribeReservedInstancesListingsResponseSetType implements org.apa
java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/");
if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) {
- writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesListingsResponseSetType", xmlWriter);
+ writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesListingsResponseSetType",
+ xmlWriter);
} else {
writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeReservedInstancesListingsResponseSetType", xmlWriter);
}
@@ -208,9 +211,8 @@ public class DescribeReservedInstancesListingsResponseSetType implements org.apa
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseType.java
index b177715..0a979a8 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseType.java
@@ -125,7 +125,8 @@ public class DescribeReservedInstancesListingsResponseType implements org.apache
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -202,7 +203,8 @@ public class DescribeReservedInstancesListingsResponseType implements org.apache
if (localReservedInstancesListingsSet == null) {
throw new org.apache.axis2.databinding.ADBException("reservedInstancesListingsSet cannot be null!!");
}
- localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet"), factory, xmlWriter);
+ localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet"), factory,
+ xmlWriter);
xmlWriter.writeEndElement();
@@ -211,9 +213,8 @@ public class DescribeReservedInstancesListingsResponseType implements org.apache
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -445,7 +446,8 @@ public class DescribeReservedInstancesListingsResponseType implements org.apache
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet").equals(reader.getName())) {
object.setReservedInstancesListingsSet(com.amazon.ec2.DescribeReservedInstancesListingsResponseSetType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsType.java
index 05b6cb6..7d00dfc 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsType.java
@@ -191,7 +191,8 @@ public class DescribeReservedInstancesListingsType implements org.apache.axis2.d
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -236,7 +237,8 @@ public class DescribeReservedInstancesListingsType implements org.apache.axis2.d
if (localReservedInstancesListingSet == null) {
throw new org.apache.axis2.databinding.ADBException("reservedInstancesListingSet cannot be null!!");
}
- localReservedInstancesListingSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingSet"), factory, xmlWriter);
+ localReservedInstancesListingSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingSet"), factory,
+ xmlWriter);
}
if (localReservedInstancesSetTracker) {
if (localReservedInstancesSet == null) {
@@ -257,9 +259,8 @@ public class DescribeReservedInstancesListingsType implements org.apache.axis2.d
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -483,7 +484,8 @@ public class DescribeReservedInstancesListingsType implements org.apache.axis2.d
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingSet").equals(reader.getName())) {
object.setReservedInstancesListingSet(com.amazon.ec2.DescribeReservedInstancesListingSetType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferings.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferings.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferings.java
index d948e50..7ea529d 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferings.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferings.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeReservedInstancesOfferings implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeReservedInstancesOfferings", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "DescribeReservedInstancesOfferings", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeReservedInstancesOfferings implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeReservedInstancesOfferings implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponse.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponse.java
index 31dc2ce..d8d7c1c 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponse.java
@@ -99,7 +99,8 @@ public class DescribeReservedInstancesOfferingsResponse implements org.apache.ax
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -119,9 +120,8 @@ public class DescribeReservedInstancesOfferingsResponse implements org.apache.ax
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetItemType.java
index e06c06c..81d277a 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetItemType.java
@@ -418,7 +418,8 @@ public class DescribeReservedInstancesOfferingsResponseSetItemType implements or
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -453,7 +454,8 @@ public class DescribeReservedInstancesOfferingsResponseSetItemType implements or
java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/");
if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) {
- writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesOfferingsResponseSetItemType", xmlWriter);
+ writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesOfferingsResponseSetItemType",
+ xmlWriter);
} else {
writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeReservedInstancesOfferingsResponseSetItemType", xmlWriter);
}
@@ -818,9 +820,8 @@ public class DescribeReservedInstancesOfferingsResponseSetItemType implements or
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -1107,7 +1108,8 @@ public class DescribeReservedInstancesOfferingsResponseSetItemType implements or
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingId").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingId").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetType.java
index 8757515..78d14c0 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetType.java
@@ -103,7 +103,8 @@ public class DescribeReservedInstancesOfferingsResponseSetType implements org.ap
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem);
list.add(param);
- this.localItem = (com.amazon.ec2.DescribeReservedInstancesOfferingsResponseSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesOfferingsResponseSetItemType[list.size()]);
+ this.localItem =
+ (com.amazon.ec2.DescribeReservedInstancesOfferingsResponseSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesOfferingsResponseSetItemType[list.size()]);
}
@@ -142,7 +143,8 @@ public class DescribeReservedInstancesOfferingsResponseSetType implements org.ap
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -177,7 +179,8 @@ public class DescribeReservedInstancesOfferingsResponseSetType implements org.ap
java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/");
if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) {
- writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesOfferingsResponseSetType", xmlWriter);
+ writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesOfferingsResponseSetType",
+ xmlWriter);
} else {
writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeReservedInstancesOfferingsResponseSetType", xmlWriter);
}
@@ -208,9 +211,8 @@ public class DescribeReservedInstancesOfferingsResponseSetType implements org.ap
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseType.java
index 793c3c2..5921745 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseType.java
@@ -163,7 +163,8 @@ public class DescribeReservedInstancesOfferingsResponseType implements org.apach
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -240,7 +241,8 @@ public class DescribeReservedInstancesOfferingsResponseType implements org.apach
if (localReservedInstancesOfferingsSet == null) {
throw new org.apache.axis2.databinding.ADBException("reservedInstancesOfferingsSet cannot be null!!");
}
- localReservedInstancesOfferingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet"), factory, xmlWriter);
+ localReservedInstancesOfferingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet"), factory,
+ xmlWriter);
if (localNextTokenTracker) {
namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
if (!namespace.equals("")) {
@@ -281,9 +283,8 @@ public class DescribeReservedInstancesOfferingsResponseType implements org.apach
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -524,7 +525,8 @@ public class DescribeReservedInstancesOfferingsResponseType implements org.apach
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet").equals(reader.getName())) {
object.setReservedInstancesOfferingsSet(com.amazon.ec2.DescribeReservedInstancesOfferingsResponseSetType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetItemType.java
index abf5d28..3f4bb83 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetItemType.java
@@ -101,7 +101,8 @@ public class DescribeReservedInstancesOfferingsSetItemType implements org.apache
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DescribeReservedInstancesOfferingsSetItemType implements org.apache
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -391,7 +391,8 @@ public class DescribeReservedInstancesOfferingsSetItemType implements org.apache
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingId").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingId").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetType.java
index 82870fb..eefeb19 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetType.java
@@ -103,7 +103,8 @@ public class DescribeReservedInstancesOfferingsSetType implements org.apache.axi
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem);
list.add(param);
- this.localItem = (com.amazon.ec2.DescribeReservedInstancesOfferingsSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesOfferingsSetItemType[list.size()]);
+ this.localItem =
+ (com.amazon.ec2.DescribeReservedInstancesOfferingsSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesOfferingsSetItemType[list.size()]);
}
@@ -142,7 +143,8 @@ public class DescribeReservedInstancesOfferingsSetType implements org.apache.axi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +210,8 @@ public class DescribeReservedInstancesOfferingsSetType implements org.apache.axi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsType.java
index 1b9a0e9..163bfbb 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsType.java
@@ -576,7 +576,8 @@ public class DescribeReservedInstancesOfferingsType implements org.apache.axis2.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -621,8 +622,8 @@ public class DescribeReservedInstancesOfferingsType implements org.apache.axis2.
if (localReservedInstancesOfferingsSet == null) {
throw new org.apache.axis2.databinding.ADBException("reservedInstancesOfferingsSet cannot be null!!");
}
- localReservedInstancesOfferingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet"), factory,
- xmlWriter);
+ localReservedInstancesOfferingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet"),
+ factory, xmlWriter);
}
if (localInstanceTypeTracker) {
namespace = "http://ec2.amazonaws.com/doc/2012-08-15/";
@@ -985,9 +986,8 @@ public class DescribeReservedInstancesOfferingsType implements org.apache.axis2.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -1282,7 +1282,8 @@ public class DescribeReservedInstancesOfferingsType implements org.apache.axis2.
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet").equals(reader.getName())) {
object.setReservedInstancesOfferingsSet(com.amazon.ec2.DescribeReservedInstancesOfferingsSetType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponse.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponse.java
index d29f739..a8ae49c 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeReservedInstancesResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeReservedInstancesResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "DescribeReservedInstancesResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeReservedInstancesResponse implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeReservedInstancesResponse implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetItemType.java
index 9bda3a5..bed7096 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetItemType.java
@@ -465,7 +465,8 @@ public class DescribeReservedInstancesResponseSetItemType implements org.apache.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -931,9 +932,8 @@ public class DescribeReservedInstancesResponseSetItemType implements org.apache.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetType.java
index 83c7ee1..4b2aa45 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetType.java
@@ -103,7 +103,8 @@ public class DescribeReservedInstancesResponseSetType implements org.apache.axis
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem);
list.add(param);
- this.localItem = (com.amazon.ec2.DescribeReservedInstancesResponseSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesResponseSetItemType[list.size()]);
+ this.localItem =
+ (com.amazon.ec2.DescribeReservedInstancesResponseSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesResponseSetItemType[list.size()]);
}
@@ -142,7 +143,8 @@ public class DescribeReservedInstancesResponseSetType implements org.apache.axis
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +210,8 @@ public class DescribeReservedInstancesResponseSetType implements org.apache.axis
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseType.java
index a89e2ea..e0e477a 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseType.java
@@ -125,7 +125,8 @@ public class DescribeReservedInstancesResponseType implements org.apache.axis2.d
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeReservedInstancesResponseType implements org.apache.axis2.d
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetItemType.java
index 6a53c83..6763a59 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetItemType.java
@@ -101,7 +101,8 @@ public class DescribeReservedInstancesSetItemType implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DescribeReservedInstancesSetItemType implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetType.java
index 2c5fcd3..8babb88 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetType.java
@@ -142,7 +142,8 @@ public class DescribeReservedInstancesSetType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeReservedInstancesSetType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesType.java
index 39e83ee..331c47c 100644
--- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesType.java
@@ -191,7 +191,8 @@ public class DescribeReservedInstancesType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -284,9 +285,8 @@ public class DescribeReservedInstancesType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
[09/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java
index 20b65a3..555daa0 100644
--- a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java
+++ b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java
@@ -21,7 +21,6 @@ import java.io.InputStream;
import java.security.cert.Certificate;
import java.security.cert.CertificateFactory;
-import javax.inject.Inject;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationModule.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationModule.java b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationModule.java
index b77b415..2dcd391 100644
--- a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationModule.java
+++ b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationModule.java
@@ -16,13 +16,12 @@
// under the License.
package com.cloud.bridge.auth.ec2;
-import org.apache.axis2.modules.Module;
-
-import org.apache.log4j.Logger;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.AxisDescription;
import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.modules.Module;
+import org.apache.log4j.Logger;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationModule.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationModule.java b/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationModule.java
index 740a4a6..6f43fd1 100644
--- a/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationModule.java
+++ b/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationModule.java
@@ -16,13 +16,12 @@
// under the License.
package com.cloud.bridge.auth.s3;
-import org.apache.axis2.modules.Module;
-
-import org.apache.log4j.Logger;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.AxisDescription;
import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.modules.Module;
+import org.apache.log4j.Logger;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/io/DimeDelimitedInputStream.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/io/DimeDelimitedInputStream.java b/awsapi/src/com/cloud/bridge/io/DimeDelimitedInputStream.java
index 89066f5..0f40c93 100644
--- a/awsapi/src/com/cloud/bridge/io/DimeDelimitedInputStream.java
+++ b/awsapi/src/com/cloud/bridge/io/DimeDelimitedInputStream.java
@@ -18,9 +18,10 @@
package com.cloud.bridge.io;
+import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.FilterInputStream;
+
import org.apache.log4j.Logger;
/**
@@ -362,7 +363,8 @@ public class DimeDelimitedInputStream extends FilterInputStream {
int typeLength = ((((int)header[6]) << 8) & 0xff00) | ((int)header[7]);
//DATA_LENGTH
- recordLength = ((((long)header[8]) << 24) & 0xff000000L) | ((((long)header[9]) << 16) & 0xff0000L) | ((((long)header[10]) << 8) & 0xff00L) | ((long)header[11] & 0xffL);
+ recordLength =
+ ((((long)header[8]) << 24) & 0xff000000L) | ((((long)header[9]) << 16) & 0xff0000L) | ((((long)header[10]) << 8) & 0xff00L) | ((long)header[11] & 0xffL);
//OPTIONS + PADDING
if (0 != optionsLength) {
@@ -419,8 +421,8 @@ public class DimeDelimitedInputStream extends FilterInputStream {
throw streamInError;
}
}
- logger.debug("MB:" + MB + ", ME:" + ME + ", CF:" + moreChunks + "Option length:" + optionsLength + ", ID length:" + idLength + ", typeLength:" + typeLength + ", TYPE_T:" +
- tnf);
+ logger.debug("MB:" + MB + ", ME:" + ME + ", CF:" + moreChunks + "Option length:" + optionsLength + ", ID length:" + idLength + ", typeLength:" + typeLength +
+ ", TYPE_T:" + tnf);
logger.debug("id:\"" + id + "\"");
logger.debug("type:\"" + type + "\"");
logger.debug("recordlength:\"" + recordLength + "\"");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java b/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java
index 77249aa..51da536 100644
--- a/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java
+++ b/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java
@@ -24,15 +24,15 @@ import java.io.OutputStream;
import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-import javax.xml.stream.XMLOutputFactory;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMFactory;
-import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLSerializer;
import org.apache.axis2.databinding.ADBBean;
import org.apache.axis2.databinding.ADBException;
+import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLSerializer;
/**
* Provide an MTOM aware serializable output stream writer to be consumed by implementors of the
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java b/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java
index d4e00d7..1700649 100644
--- a/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java
+++ b/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java
@@ -16,10 +16,10 @@
// under the License.
package com.cloud.bridge.io;
-import org.apache.log4j.Logger;
-
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.log4j.Logger;
/**
* A DIME stream is actually composed of multiple encoded streams.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/io/S3CAStorBucketAdapter.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/io/S3CAStorBucketAdapter.java b/awsapi/src/com/cloud/bridge/io/S3CAStorBucketAdapter.java
index 74b2c8c..b0dc566 100644
--- a/awsapi/src/com/cloud/bridge/io/S3CAStorBucketAdapter.java
+++ b/awsapi/src/com/cloud/bridge/io/S3CAStorBucketAdapter.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.bridge.io;
-import java.util.Arrays;
-import java.util.HashSet;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileOutputStream;
@@ -30,12 +28,29 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+import java.util.HashSet;
import javax.activation.DataHandler;
import javax.activation.DataSource;
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
+import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.log4j.Logger;
+import com.caringo.client.ResettableFileInputStream;
+import com.caringo.client.ScspClient;
+import com.caringo.client.ScspExecutionException;
+import com.caringo.client.ScspHeaders;
+import com.caringo.client.ScspQueryArgs;
+import com.caringo.client.ScspResponse;
+import com.caringo.client.locate.Locator;
+import com.caringo.client.locate.StaticLocator;
+import com.caringo.client.locate.ZeroconfLocator;
+
import com.cloud.bridge.service.core.s3.S3BucketAdapter;
import com.cloud.bridge.service.core.s3.S3MultipartPart;
import com.cloud.bridge.service.exception.ConfigurationException;
@@ -43,23 +58,8 @@ import com.cloud.bridge.service.exception.FileNotExistException;
import com.cloud.bridge.service.exception.InternalErrorException;
import com.cloud.bridge.service.exception.OutOfStorageException;
import com.cloud.bridge.service.exception.UnsupportedException;
-import com.cloud.bridge.util.StringHelper;
import com.cloud.bridge.util.OrderedPair;
-
-import com.caringo.client.locate.Locator;
-import com.caringo.client.locate.StaticLocator;
-import com.caringo.client.locate.ZeroconfLocator;
-import com.caringo.client.ResettableFileInputStream;
-import com.caringo.client.ScspClient;
-import com.caringo.client.ScspExecutionException;
-import com.caringo.client.ScspHeaders;
-import com.caringo.client.ScspQueryArgs;
-import com.caringo.client.ScspResponse;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
+import com.cloud.bridge.util.StringHelper;
/**
* Creates an SCSP client to a CAStor cluster, configured in "storage.root",
@@ -152,7 +152,7 @@ public class S3CAStorBucketAdapter implements S3BucketAdapter {
}
try {
s_logger.info("CAStor client starting: " + (_domain == null ? "default domain" : "domain " + _domain) + " " +
- (clusterName == null ? Arrays.toString(castorNodes) : clusterName) + " :" + castorPort);
+ (clusterName == null ? Arrays.toString(castorNodes) : clusterName) + " :" + castorPort);
_scspClient = new ScspClient(_locator, castorPort, DEFAULT_MAX_POOL_SIZE, DEFAULT_MAX_RETRIES, CONNECTION_TIMEOUT, CM_IDLE_TIMEOUT);
_scspClient.start();
} catch (Exception e) {
@@ -198,7 +198,8 @@ public class S3CAStorBucketAdapter implements S3BucketAdapter {
ScspResponse bwResponse = myClient(mountedRoot).write(bucket, new ByteArrayInputStream("".getBytes()), 0, domainQueryArg(), new ScspHeaders());
if (bwResponse.getHttpStatusCode() != HTTP_CREATED) {
if (bwResponse.getHttpStatusCode() == HTTP_PRECONDITION_FAILED)
- s_logger.error("CAStor unable to create bucket " + bucket + " because domain " + (this._domain == null ? "(default)" : this._domain) + " does not exist");
+ s_logger.error("CAStor unable to create bucket " + bucket + " because domain " + (this._domain == null ? "(default)" : this._domain) +
+ " does not exist");
else
s_logger.error("CAStor unable to create bucket " + bucket + ": " + bwResponse.getHttpStatusCode());
throw new OutOfStorageException("CAStor unable to create bucket " + bucket + ": " + bwResponse.getHttpStatusCode());
@@ -279,8 +280,8 @@ public class S3CAStorBucketAdapter implements S3BucketAdapter {
}
try {
- ScspResponse bwResponse = myClient(mountedRoot).write(bucket + "/" + fileName, new ResettableFileInputStream(spoolFile), streamLen, domainQueryArg(),
- new ScspHeaders());
+ ScspResponse bwResponse =
+ myClient(mountedRoot).write(bucket + "/" + fileName, new ResettableFileInputStream(spoolFile), streamLen, domainQueryArg(), new ScspHeaders());
if (bwResponse.getHttpStatusCode() >= HTTP_UNSUCCESSFUL) {
s_logger.error("CAStor write responded with error " + bwResponse.getHttpStatusCode());
throw new OutOfStorageException("Unable to write object to CAStor " + bucket + "/" + fileName + ": " + bwResponse.getHttpStatusCode());
@@ -319,7 +320,8 @@ public class S3CAStorBucketAdapter implements S3BucketAdapter {
* @return OrderedPair with the first value the MD5 of the final object, and the second value the length of the final object
*/
@Override
- public OrderedPair<String, Long> concatentateObjects(String mountedRoot, String destBucket, String fileName, String sourceBucket, S3MultipartPart[] parts, OutputStream client) {
+ public OrderedPair<String, Long> concatentateObjects(String mountedRoot, String destBucket, String fileName, String sourceBucket, S3MultipartPart[] parts,
+ OutputStream client) {
// TODO
throw new UnsupportedException("Multipart upload support not yet implemented in CAStor plugin");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java b/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java
index 77d847c..85d1e0e 100644
--- a/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java
+++ b/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java
@@ -35,8 +35,8 @@ import com.cloud.bridge.service.core.s3.S3MultipartPart;
import com.cloud.bridge.service.exception.FileNotExistException;
import com.cloud.bridge.service.exception.InternalErrorException;
import com.cloud.bridge.service.exception.OutOfStorageException;
-import com.cloud.bridge.util.StringHelper;
import com.cloud.bridge.util.OrderedPair;
+import com.cloud.bridge.util.StringHelper;
public class S3FileSystemBucketAdapter implements S3BucketAdapter {
protected final static Logger logger = Logger.getLogger(S3FileSystemBucketAdapter.class);
@@ -134,7 +134,8 @@ public class S3FileSystemBucketAdapter implements S3BucketAdapter {
* @return OrderedPair with the first value the MD5 of the final object, and the second value the length of the final object
*/
@Override
- public OrderedPair<String, Long> concatentateObjects(String mountedRoot, String destBucket, String fileName, String sourceBucket, S3MultipartPart[] parts, OutputStream client) {
+ public OrderedPair<String, Long> concatentateObjects(String mountedRoot, String destBucket, String fileName, String sourceBucket, S3MultipartPart[] parts,
+ OutputStream client) {
MessageDigest md5;
long totalLength = 0;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java b/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java
index eb2831c..aeb6de5 100644
--- a/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java
+++ b/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java
@@ -22,7 +22,6 @@ import org.apache.axis2.engine.ServiceLifeCycle;
import org.apache.log4j.Logger;
import com.cloud.bridge.service.controller.s3.ServiceProvider;
-import com.cloud.utils.db.Transaction;
/**
* ServiceEngineLifecycle is used to participate Axis service life cycle management
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java b/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java
index 0802912..a60df06 100644
--- a/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java
+++ b/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java
@@ -18,8 +18,6 @@ package com.cloud.bridge.model;
import javax.persistence.Column;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/model/SAcl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/SAcl.java b/awsapi/src/com/cloud/bridge/model/SAcl.java
index 79f9932..907fb39 100644
--- a/awsapi/src/com/cloud/bridge/model/SAcl.java
+++ b/awsapi/src/com/cloud/bridge/model/SAcl.java
@@ -16,13 +16,6 @@
// under the License.
package com.cloud.bridge.model;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.cloud.bridge.service.exception.UnsupportedException;
-import com.cloud.bridge.util.OrderedPair;
-import com.cloud.bridge.util.Triple;
-
/**
* A model of stored ACLs to remember the ACL permissions per canonicalUserID per grantee
* Hold the AWS S3 grantee and permission constants.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/model/SBucket.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/SBucket.java b/awsapi/src/com/cloud/bridge/model/SBucket.java
index 53b1a5e..033d59c 100644
--- a/awsapi/src/com/cloud/bridge/model/SBucket.java
+++ b/awsapi/src/com/cloud/bridge/model/SBucket.java
@@ -16,11 +16,6 @@
// under the License.
package com.cloud.bridge.model;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
/**
* Holds the relation
* Id,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/model/SBucketVO.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/SBucketVO.java b/awsapi/src/com/cloud/bridge/model/SBucketVO.java
index f71688a..cc97e46 100644
--- a/awsapi/src/com/cloud/bridge/model/SBucketVO.java
+++ b/awsapi/src/com/cloud/bridge/model/SBucketVO.java
@@ -16,7 +16,6 @@
// under the License.
package com.cloud.bridge.model;
-import java.io.Serializable;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/model/SHost.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/SHost.java b/awsapi/src/com/cloud/bridge/model/SHost.java
index d085425..6c57857 100644
--- a/awsapi/src/com/cloud/bridge/model/SHost.java
+++ b/awsapi/src/com/cloud/bridge/model/SHost.java
@@ -16,10 +16,6 @@
// under the License.
package com.cloud.bridge.model;
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
public interface SHost {
public static final int STORAGE_HOST_TYPE_LOCAL = 0;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/model/SObjectItemVO.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/SObjectItemVO.java b/awsapi/src/com/cloud/bridge/model/SObjectItemVO.java
index 1fcac58..5eada3c 100644
--- a/awsapi/src/com/cloud/bridge/model/SObjectItemVO.java
+++ b/awsapi/src/com/cloud/bridge/model/SObjectItemVO.java
@@ -16,7 +16,6 @@
// under the License.
package com.cloud.bridge.model;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java b/awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java
index e5d84a4..9a10c2e 100644
--- a/awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java
+++ b/awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.bridge.model;
-import java.io.Serializable;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java
index 95c3a90..a18bb4c 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java
@@ -24,7 +24,6 @@ import com.cloud.bridge.model.CloudStackAccountVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
@Component
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
index 7f96cac..f36d1e7 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
@@ -26,7 +26,6 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
@Component
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
index 01de27e..effc381 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
@@ -22,13 +22,9 @@ import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import com.cloud.bridge.model.CloudStackServiceOfferingVO;
-import com.cloud.bridge.model.SHostVO;
-import com.cloud.stack.models.CloudStackConfiguration;
-import com.cloud.stack.models.CloudStackServiceOffering;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
@Component
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
index a28965c..279ee43 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
@@ -22,12 +22,11 @@ import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import com.cloud.bridge.model.CloudStackUserVO;
+import com.cloud.utils.crypt.DBEncryptionUtil;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
-import com.cloud.utils.crypt.DBEncryptionUtil;
@Component
@Local(value = {CloudStackUserDao.class})
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
index 041cb6d..a592bad 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
@@ -25,7 +25,6 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
@Component
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java
index bb868a8..929af7a 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java
@@ -24,7 +24,6 @@ import com.cloud.bridge.model.MHostMountVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
@Component
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java
index 902e5e8..36a8cdf 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java
@@ -27,7 +27,6 @@ import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
@Component
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java
index a24c7f7..8ef7839 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java
@@ -23,16 +23,12 @@ import javax.ejb.Local;
import org.springframework.stereotype.Component;
-import com.cloud.bridge.model.MultiPartPartsVO;
import com.cloud.bridge.model.MultiPartUploadsVO;
-import com.cloud.bridge.model.SBucketVO;
import com.cloud.bridge.util.OrderedPair;
-import com.cloud.utils.db.Attribute;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
@Component
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java b/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java
index 13456d8..ffa1f5d 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java
@@ -33,7 +33,6 @@ import com.cloud.bridge.service.core.s3.S3MetaDataEntry;
import com.cloud.bridge.service.core.s3.S3MultipartPart;
import com.cloud.bridge.service.core.s3.S3MultipartUpload;
import com.cloud.bridge.util.OrderedPair;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
public class MultipartLoadDao {
@@ -258,7 +257,8 @@ public class MultipartLoadDao {
* @return an array of S3MultipartPart objects
* @throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException
*/
- public S3MultipartPart[] getParts(int uploadId, int maxParts, int startAt) throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException {
+ public S3MultipartPart[] getParts(int uploadId, int maxParts, int startAt) throws InstantiationException, IllegalAccessException, ClassNotFoundException,
+ SQLException {
S3MultipartPart[] parts = new S3MultipartPart[maxParts];
int i = 0;
List<MultiPartPartsVO> partsVO;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java
index 97ae09c..e647c0d 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java
@@ -26,7 +26,6 @@ import com.cloud.bridge.model.MultipartMetaVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
@Component
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
index b302dda..8508590 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
@@ -17,8 +17,6 @@
package com.cloud.bridge.persist.dao;
import javax.ejb.Local;
-import javax.persistence.Entity;
-import javax.persistence.Table;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -27,7 +25,6 @@ import com.cloud.bridge.model.OfferingBundleVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
@Component
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java
index 26a65ee..0fb697b 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java
@@ -31,7 +31,6 @@ import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
@Component
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java
index 02d8fa3..a01cce4 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java
@@ -22,13 +22,11 @@ import javax.ejb.Local;
import org.springframework.stereotype.Component;
-import com.cloud.bridge.model.SBucket;
import com.cloud.bridge.model.SBucketVO;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
@Component
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java
index d46aa67..a5ebbc1 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java
@@ -24,7 +24,6 @@ import com.cloud.bridge.model.SHostVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
@Component
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java
index a40ca5a..65a8f6b 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java
@@ -27,7 +27,6 @@ import com.cloud.bridge.service.core.s3.S3MetaDataEntry;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
@Component
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java
index 2e94c7c..f2a00b0 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java
@@ -32,7 +32,6 @@ import com.cloud.bridge.model.SObjectVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
@Component
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java
index 33ea03b..30387b8 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java
@@ -26,7 +26,6 @@ import com.cloud.bridge.model.SObjectItemVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
@Component
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java
index c9dd549..45c4269 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.bridge.persist.dao;
-import java.sql.*;
-
import javax.ejb.Local;
import org.apache.log4j.Logger;
@@ -28,7 +26,6 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
@Component
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java b/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
index a7e00a1..9fc353f 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
@@ -17,7 +17,6 @@
package com.cloud.bridge.service;
import java.io.IOException;
-
import java.io.OutputStreamWriter;
import java.util.UUID;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
index b9e4bd6..5c56e9d 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
@@ -103,6 +103,7 @@ import com.amazon.ec2.RunInstancesResponse;
import com.amazon.ec2.StartInstancesResponse;
import com.amazon.ec2.StopInstancesResponse;
import com.amazon.ec2.TerminateInstancesResponse;
+
import com.cloud.bridge.model.UserCredentialsVO;
import com.cloud.bridge.persist.dao.CloudStackUserDaoImpl;
import com.cloud.bridge.persist.dao.OfferingDaoImpl;
@@ -131,8 +132,8 @@ import com.cloud.bridge.service.core.ec2.EC2Engine;
import com.cloud.bridge.service.core.ec2.EC2Filter;
import com.cloud.bridge.service.core.ec2.EC2GroupFilterSet;
import com.cloud.bridge.service.core.ec2.EC2Image;
-import com.cloud.bridge.service.core.ec2.EC2ImageFilterSet;
import com.cloud.bridge.service.core.ec2.EC2ImageAttributes.ImageAttribute;
+import com.cloud.bridge.service.core.ec2.EC2ImageFilterSet;
import com.cloud.bridge.service.core.ec2.EC2ImageLaunchPermission;
import com.cloud.bridge.service.core.ec2.EC2ImportKeyPair;
import com.cloud.bridge.service.core.ec2.EC2InstanceFilterSet;
@@ -160,7 +161,6 @@ import com.cloud.bridge.util.AuthenticationUtils;
import com.cloud.bridge.util.ConfigurationHelper;
import com.cloud.bridge.util.EC2RestAuth;
import com.cloud.stack.models.CloudStackAccount;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
@Component("EC2RestServlet")
@@ -829,9 +829,8 @@ public class EC2RestServlet extends HttpServlet {
}
// -> execute the request
- RevokeSecurityGroupIngressResponse EC2response = EC2SoapServiceImpl.toRevokeSecurityGroupIngressResponse(ServiceProvider.getInstance()
- .getEC2Engine()
- .revokeSecurityGroup(EC2request));
+ RevokeSecurityGroupIngressResponse EC2response =
+ EC2SoapServiceImpl.toRevokeSecurityGroupIngressResponse(ServiceProvider.getInstance().getEC2Engine().revokeSecurityGroup(EC2request));
serializeResponse(response, EC2response);
}
@@ -915,9 +914,8 @@ public class EC2RestServlet extends HttpServlet {
}
// -> execute the request
- AuthorizeSecurityGroupIngressResponse EC2response = EC2SoapServiceImpl.toAuthorizeSecurityGroupIngressResponse(ServiceProvider.getInstance()
- .getEC2Engine()
- .authorizeSecurityGroup(EC2request));
+ AuthorizeSecurityGroupIngressResponse EC2response =
+ EC2SoapServiceImpl.toAuthorizeSecurityGroupIngressResponse(ServiceProvider.getInstance().getEC2Engine().authorizeSecurityGroup(EC2request));
serializeResponse(response, EC2response);
}
@@ -1013,9 +1011,8 @@ public class EC2RestServlet extends HttpServlet {
}
// -> execute the request
- CreateSecurityGroupResponse EC2response = EC2SoapServiceImpl.toCreateSecurityGroupResponse(ServiceProvider.getInstance()
- .getEC2Engine()
- .createSecurityGroup(groupName, groupDescription));
+ CreateSecurityGroupResponse EC2response =
+ EC2SoapServiceImpl.toCreateSecurityGroupResponse(ServiceProvider.getInstance().getEC2Engine().createSecurityGroup(groupName, groupDescription));
serializeResponse(response, EC2response);
}
@@ -1030,7 +1027,8 @@ public class EC2RestServlet extends HttpServlet {
}
// -> execute the request
- DeleteSecurityGroupResponse EC2response = EC2SoapServiceImpl.toDeleteSecurityGroupResponse(ServiceProvider.getInstance().getEC2Engine().deleteSecurityGroup(groupName));
+ DeleteSecurityGroupResponse EC2response =
+ EC2SoapServiceImpl.toDeleteSecurityGroupResponse(ServiceProvider.getInstance().getEC2Engine().deleteSecurityGroup(groupName));
serializeResponse(response, EC2response);
}
@@ -1167,7 +1165,8 @@ public class EC2RestServlet extends HttpServlet {
}
// -> execute the request
- ModifyImageAttributeResponse EC2response = EC2SoapServiceImpl.toModifyImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyImageAttribute(ec2request));
+ ModifyImageAttributeResponse EC2response =
+ EC2SoapServiceImpl.toModifyImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyImageAttribute(ec2request));
serializeResponse(response, EC2response);
}
@@ -1231,7 +1230,8 @@ public class EC2RestServlet extends HttpServlet {
ec2request.addLaunchPermission(launchPermission);
// -> execute the request
- ResetImageAttributeResponse EC2response = EC2SoapServiceImpl.toResetImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyImageAttribute(ec2request));
+ ResetImageAttributeResponse EC2response =
+ EC2SoapServiceImpl.toResetImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyImageAttribute(ec2request));
serializeResponse(response, EC2response);
}
@@ -1442,9 +1442,8 @@ public class EC2RestServlet extends HttpServlet {
}
// -> execute the request
- DescribeAvailabilityZonesResponse EC2response = EC2SoapServiceImpl.toDescribeAvailabilityZonesResponse(ServiceProvider.getInstance()
- .getEC2Engine()
- .describeAvailabilityZones(EC2request));
+ DescribeAvailabilityZonesResponse EC2response =
+ EC2SoapServiceImpl.toDescribeAvailabilityZonesResponse(ServiceProvider.getInstance().getEC2Engine().describeAvailabilityZones(EC2request));
serializeResponse(response, EC2response);
}
@@ -1499,9 +1498,8 @@ public class EC2RestServlet extends HttpServlet {
throw new EC2ServiceException(ClientError.MissingParamter, "Missing required parameter - Attribute");
}
- DescribeImageAttributeResponse EC2response = EC2SoapServiceImpl.toDescribeImageAttributeResponse(ServiceProvider.getInstance()
- .getEC2Engine()
- .describeImageAttribute(ec2request));
+ DescribeImageAttributeResponse EC2response =
+ EC2SoapServiceImpl.toDescribeImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().describeImageAttribute(ec2request));
serializeResponse(response, EC2response);
}
@@ -1678,9 +1676,8 @@ public class EC2RestServlet extends HttpServlet {
}
// -> execute the request
- DescribeInstanceAttributeResponse EC2response = EC2SoapServiceImpl.toDescribeInstanceAttributeResponse(ServiceProvider.getInstance()
- .getEC2Engine()
- .describeInstances(EC2request));
+ DescribeInstanceAttributeResponse EC2response =
+ EC2SoapServiceImpl.toDescribeInstanceAttributeResponse(ServiceProvider.getInstance().getEC2Engine().describeInstances(EC2request));
serializeResponse(response, EC2response);
}
@@ -1709,9 +1706,8 @@ public class EC2RestServlet extends HttpServlet {
}
// -> execute the request
- ModifyInstanceAttributeResponse EC2response = EC2SoapServiceImpl.toModifyInstanceAttributeResponse(ServiceProvider.getInstance()
- .getEC2Engine()
- .modifyInstanceAttribute(ec2Request));
+ ModifyInstanceAttributeResponse EC2response =
+ EC2SoapServiceImpl.toModifyInstanceAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyInstanceAttribute(ec2Request));
serializeResponse(response, EC2response);
}
@@ -1769,7 +1765,8 @@ public class EC2RestServlet extends HttpServlet {
// -> execute the request
EC2Engine engine = ServiceProvider.getInstance().getEC2Engine();
- DescribeVolumesResponse EC2response = EC2SoapServiceImpl.toDescribeVolumesResponse(ServiceProvider.getInstance().getEC2Engine().describeVolumes(EC2request), engine);
+ DescribeVolumesResponse EC2response =
+ EC2SoapServiceImpl.toDescribeVolumesResponse(ServiceProvider.getInstance().getEC2Engine().describeVolumes(EC2request), engine);
serializeResponse(response, EC2response);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/EC2SoapService.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/EC2SoapService.java b/awsapi/src/com/cloud/bridge/service/EC2SoapService.java
index 5f3c13e..cfad70c 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2SoapService.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2SoapService.java
@@ -18,7 +18,296 @@ package com.cloud.bridge.service;
import org.apache.log4j.Logger;
-import com.amazon.ec2.*;
+import com.amazon.ec2.ActivateLicense;
+import com.amazon.ec2.ActivateLicenseResponse;
+import com.amazon.ec2.AllocateAddress;
+import com.amazon.ec2.AllocateAddressResponse;
+import com.amazon.ec2.AmazonEC2SkeletonInterface;
+import com.amazon.ec2.AssignPrivateIpAddresses;
+import com.amazon.ec2.AssignPrivateIpAddressesResponse;
+import com.amazon.ec2.AssociateAddress;
+import com.amazon.ec2.AssociateAddressResponse;
+import com.amazon.ec2.AssociateDhcpOptions;
+import com.amazon.ec2.AssociateDhcpOptionsResponse;
+import com.amazon.ec2.AssociateRouteTable;
+import com.amazon.ec2.AssociateRouteTableResponse;
+import com.amazon.ec2.AttachInternetGateway;
+import com.amazon.ec2.AttachInternetGatewayResponse;
+import com.amazon.ec2.AttachNetworkInterface;
+import com.amazon.ec2.AttachNetworkInterfaceResponse;
+import com.amazon.ec2.AttachVolume;
+import com.amazon.ec2.AttachVolumeResponse;
+import com.amazon.ec2.AttachVpnGateway;
+import com.amazon.ec2.AttachVpnGatewayResponse;
+import com.amazon.ec2.AuthorizeSecurityGroupEgress;
+import com.amazon.ec2.AuthorizeSecurityGroupEgressResponse;
+import com.amazon.ec2.AuthorizeSecurityGroupIngress;
+import com.amazon.ec2.AuthorizeSecurityGroupIngressResponse;
+import com.amazon.ec2.BundleInstance;
+import com.amazon.ec2.BundleInstanceResponse;
+import com.amazon.ec2.CancelBundleTask;
+import com.amazon.ec2.CancelBundleTaskResponse;
+import com.amazon.ec2.CancelConversionTask;
+import com.amazon.ec2.CancelConversionTaskResponse;
+import com.amazon.ec2.CancelExportTask;
+import com.amazon.ec2.CancelExportTaskResponse;
+import com.amazon.ec2.CancelReservedInstancesListing;
+import com.amazon.ec2.CancelReservedInstancesListingResponse;
+import com.amazon.ec2.CancelSpotInstanceRequests;
+import com.amazon.ec2.CancelSpotInstanceRequestsResponse;
+import com.amazon.ec2.ConfirmProductInstance;
+import com.amazon.ec2.ConfirmProductInstanceResponse;
+import com.amazon.ec2.CreateCustomerGateway;
+import com.amazon.ec2.CreateCustomerGatewayResponse;
+import com.amazon.ec2.CreateDhcpOptions;
+import com.amazon.ec2.CreateDhcpOptionsResponse;
+import com.amazon.ec2.CreateImage;
+import com.amazon.ec2.CreateImageResponse;
+import com.amazon.ec2.CreateInstanceExportTask;
+import com.amazon.ec2.CreateInstanceExportTaskResponse;
+import com.amazon.ec2.CreateInternetGateway;
+import com.amazon.ec2.CreateInternetGatewayResponse;
+import com.amazon.ec2.CreateKeyPair;
+import com.amazon.ec2.CreateKeyPairResponse;
+import com.amazon.ec2.CreateNetworkAcl;
+import com.amazon.ec2.CreateNetworkAclEntry;
+import com.amazon.ec2.CreateNetworkAclEntryResponse;
+import com.amazon.ec2.CreateNetworkAclResponse;
+import com.amazon.ec2.CreateNetworkInterface;
+import com.amazon.ec2.CreateNetworkInterfaceResponse;
+import com.amazon.ec2.CreatePlacementGroup;
+import com.amazon.ec2.CreatePlacementGroupResponse;
+import com.amazon.ec2.CreateReservedInstancesListing;
+import com.amazon.ec2.CreateReservedInstancesListingResponse;
+import com.amazon.ec2.CreateRoute;
+import com.amazon.ec2.CreateRouteResponse;
+import com.amazon.ec2.CreateRouteTable;
+import com.amazon.ec2.CreateRouteTableResponse;
+import com.amazon.ec2.CreateSecurityGroup;
+import com.amazon.ec2.CreateSecurityGroupResponse;
+import com.amazon.ec2.CreateSnapshot;
+import com.amazon.ec2.CreateSnapshotResponse;
+import com.amazon.ec2.CreateSpotDatafeedSubscription;
+import com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse;
+import com.amazon.ec2.CreateSubnet;
+import com.amazon.ec2.CreateSubnetResponse;
+import com.amazon.ec2.CreateTags;
+import com.amazon.ec2.CreateTagsResponse;
+import com.amazon.ec2.CreateVolume;
+import com.amazon.ec2.CreateVolumeResponse;
+import com.amazon.ec2.CreateVpc;
+import com.amazon.ec2.CreateVpcResponse;
+import com.amazon.ec2.CreateVpnConnection;
+import com.amazon.ec2.CreateVpnConnectionResponse;
+import com.amazon.ec2.CreateVpnConnectionRoute;
+import com.amazon.ec2.CreateVpnConnectionRouteResponse;
+import com.amazon.ec2.CreateVpnGateway;
+import com.amazon.ec2.CreateVpnGatewayResponse;
+import com.amazon.ec2.DeactivateLicense;
+import com.amazon.ec2.DeactivateLicenseResponse;
+import com.amazon.ec2.DeleteCustomerGateway;
+import com.amazon.ec2.DeleteCustomerGatewayResponse;
+import com.amazon.ec2.DeleteDhcpOptions;
+import com.amazon.ec2.DeleteDhcpOptionsResponse;
+import com.amazon.ec2.DeleteInternetGateway;
+import com.amazon.ec2.DeleteInternetGatewayResponse;
+import com.amazon.ec2.DeleteKeyPair;
+import com.amazon.ec2.DeleteKeyPairResponse;
+import com.amazon.ec2.DeleteNetworkAcl;
+import com.amazon.ec2.DeleteNetworkAclEntry;
+import com.amazon.ec2.DeleteNetworkAclEntryResponse;
+import com.amazon.ec2.DeleteNetworkAclResponse;
+import com.amazon.ec2.DeleteNetworkInterface;
+import com.amazon.ec2.DeleteNetworkInterfaceResponse;
+import com.amazon.ec2.DeletePlacementGroup;
+import com.amazon.ec2.DeletePlacementGroupResponse;
+import com.amazon.ec2.DeleteRoute;
+import com.amazon.ec2.DeleteRouteResponse;
+import com.amazon.ec2.DeleteRouteTable;
+import com.amazon.ec2.DeleteRouteTableResponse;
+import com.amazon.ec2.DeleteSecurityGroup;
+import com.amazon.ec2.DeleteSecurityGroupResponse;
+import com.amazon.ec2.DeleteSnapshot;
+import com.amazon.ec2.DeleteSnapshotResponse;
+import com.amazon.ec2.DeleteSpotDatafeedSubscription;
+import com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponse;
+import com.amazon.ec2.DeleteSubnet;
+import com.amazon.ec2.DeleteSubnetResponse;
+import com.amazon.ec2.DeleteTags;
+import com.amazon.ec2.DeleteTagsResponse;
+import com.amazon.ec2.DeleteVolume;
+import com.amazon.ec2.DeleteVolumeResponse;
+import com.amazon.ec2.DeleteVpc;
+import com.amazon.ec2.DeleteVpcResponse;
+import com.amazon.ec2.DeleteVpnConnection;
+import com.amazon.ec2.DeleteVpnConnectionResponse;
+import com.amazon.ec2.DeleteVpnConnectionRoute;
+import com.amazon.ec2.DeleteVpnConnectionRouteResponse;
+import com.amazon.ec2.DeleteVpnGateway;
+import com.amazon.ec2.DeleteVpnGatewayResponse;
+import com.amazon.ec2.DeregisterImage;
+import com.amazon.ec2.DeregisterImageResponse;
+import com.amazon.ec2.DescribeAddresses;
+import com.amazon.ec2.DescribeAddressesResponse;
+import com.amazon.ec2.DescribeAvailabilityZones;
+import com.amazon.ec2.DescribeAvailabilityZonesResponse;
+import com.amazon.ec2.DescribeBundleTasks;
+import com.amazon.ec2.DescribeBundleTasksResponse;
+import com.amazon.ec2.DescribeConversionTasks;
+import com.amazon.ec2.DescribeConversionTasksResponse;
+import com.amazon.ec2.DescribeCustomerGateways;
+import com.amazon.ec2.DescribeCustomerGatewaysResponse;
+import com.amazon.ec2.DescribeDhcpOptions;
+import com.amazon.ec2.DescribeDhcpOptionsResponse;
+import com.amazon.ec2.DescribeExportTasks;
+import com.amazon.ec2.DescribeExportTasksResponse;
+import com.amazon.ec2.DescribeImageAttribute;
+import com.amazon.ec2.DescribeImageAttributeResponse;
+import com.amazon.ec2.DescribeImages;
+import com.amazon.ec2.DescribeImagesResponse;
+import com.amazon.ec2.DescribeInstanceAttribute;
+import com.amazon.ec2.DescribeInstanceAttributeResponse;
+import com.amazon.ec2.DescribeInstanceStatus;
+import com.amazon.ec2.DescribeInstanceStatusResponse;
+import com.amazon.ec2.DescribeInstances;
+import com.amazon.ec2.DescribeInstancesResponse;
+import com.amazon.ec2.DescribeInternetGateways;
+import com.amazon.ec2.DescribeInternetGatewaysResponse;
+import com.amazon.ec2.DescribeKeyPairs;
+import com.amazon.ec2.DescribeKeyPairsResponse;
+import com.amazon.ec2.DescribeLicenses;
+import com.amazon.ec2.DescribeLicensesResponse;
+import com.amazon.ec2.DescribeNetworkAcls;
+import com.amazon.ec2.DescribeNetworkAclsResponse;
+import com.amazon.ec2.DescribeNetworkInterfaceAttribute;
+import com.amazon.ec2.DescribeNetworkInterfaceAttributeResponse;
+import com.amazon.ec2.DescribeNetworkInterfaces;
+import com.amazon.ec2.DescribeNetworkInterfacesResponse;
+import com.amazon.ec2.DescribePlacementGroups;
+import com.amazon.ec2.DescribePlacementGroupsResponse;
+import com.amazon.ec2.DescribeRegions;
+import com.amazon.ec2.DescribeRegionsResponse;
+import com.amazon.ec2.DescribeReservedInstances;
+import com.amazon.ec2.DescribeReservedInstancesListings;
+import com.amazon.ec2.DescribeReservedInstancesListingsResponse;
+import com.amazon.ec2.DescribeReservedInstancesOfferings;
+import com.amazon.ec2.DescribeReservedInstancesOfferingsResponse;
+import com.amazon.ec2.DescribeReservedInstancesResponse;
+import com.amazon.ec2.DescribeRouteTables;
+import com.amazon.ec2.DescribeRouteTablesResponse;
+import com.amazon.ec2.DescribeSecurityGroups;
+import com.amazon.ec2.DescribeSecurityGroupsResponse;
+import com.amazon.ec2.DescribeSnapshotAttribute;
+import com.amazon.ec2.DescribeSnapshotAttributeResponse;
+import com.amazon.ec2.DescribeSnapshots;
+import com.amazon.ec2.DescribeSnapshotsResponse;
+import com.amazon.ec2.DescribeSpotDatafeedSubscription;
+import com.amazon.ec2.DescribeSpotDatafeedSubscriptionResponse;
+import com.amazon.ec2.DescribeSpotInstanceRequests;
+import com.amazon.ec2.DescribeSpotInstanceRequestsResponse;
+import com.amazon.ec2.DescribeSpotPriceHistory;
+import com.amazon.ec2.DescribeSpotPriceHistoryResponse;
+import com.amazon.ec2.DescribeSubnets;
+import com.amazon.ec2.DescribeSubnetsResponse;
+import com.amazon.ec2.DescribeTags;
+import com.amazon.ec2.DescribeTagsResponse;
+import com.amazon.ec2.DescribeVolumeAttribute;
+import com.amazon.ec2.DescribeVolumeAttributeResponse;
+import com.amazon.ec2.DescribeVolumeStatus;
+import com.amazon.ec2.DescribeVolumeStatusResponse;
+import com.amazon.ec2.DescribeVolumes;
+import com.amazon.ec2.DescribeVolumesResponse;
+import com.amazon.ec2.DescribeVpcs;
+import com.amazon.ec2.DescribeVpcsResponse;
+import com.amazon.ec2.DescribeVpnConnections;
+import com.amazon.ec2.DescribeVpnConnectionsResponse;
+import com.amazon.ec2.DescribeVpnGateways;
+import com.amazon.ec2.DescribeVpnGatewaysResponse;
+import com.amazon.ec2.DetachInternetGateway;
+import com.amazon.ec2.DetachInternetGatewayResponse;
+import com.amazon.ec2.DetachNetworkInterface;
+import com.amazon.ec2.DetachNetworkInterfaceResponse;
+import com.amazon.ec2.DetachVolume;
+import com.amazon.ec2.DetachVolumeResponse;
+import com.amazon.ec2.DetachVpnGateway;
+import com.amazon.ec2.DetachVpnGatewayResponse;
+import com.amazon.ec2.DisableVgwRoutePropagation;
+import com.amazon.ec2.DisableVgwRoutePropagationResponse;
+import com.amazon.ec2.DisassociateAddress;
+import com.amazon.ec2.DisassociateAddressResponse;
+import com.amazon.ec2.DisassociateRouteTable;
+import com.amazon.ec2.DisassociateRouteTableResponse;
+import com.amazon.ec2.EnableVgwRoutePropagation;
+import com.amazon.ec2.EnableVgwRoutePropagationResponse;
+import com.amazon.ec2.EnableVolumeIO;
+import com.amazon.ec2.EnableVolumeIOResponse;
+import com.amazon.ec2.GetConsoleOutput;
+import com.amazon.ec2.GetConsoleOutputResponse;
+import com.amazon.ec2.GetPasswordData;
+import com.amazon.ec2.GetPasswordDataResponse;
+import com.amazon.ec2.ImportInstance;
+import com.amazon.ec2.ImportInstanceResponse;
+import com.amazon.ec2.ImportKeyPair;
+import com.amazon.ec2.ImportKeyPairResponse;
+import com.amazon.ec2.ImportVolume;
+import com.amazon.ec2.ImportVolumeResponse;
+import com.amazon.ec2.ModifyImageAttribute;
+import com.amazon.ec2.ModifyImageAttributeResponse;
+import com.amazon.ec2.ModifyInstanceAttribute;
+import com.amazon.ec2.ModifyInstanceAttributeResponse;
+import com.amazon.ec2.ModifyNetworkInterfaceAttribute;
+import com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse;
+import com.amazon.ec2.ModifySnapshotAttribute;
+import com.amazon.ec2.ModifySnapshotAttributeResponse;
+import com.amazon.ec2.ModifyVolumeAttribute;
+import com.amazon.ec2.ModifyVolumeAttributeResponse;
+import com.amazon.ec2.MonitorInstances;
+import com.amazon.ec2.MonitorInstancesResponse;
+import com.amazon.ec2.PurchaseReservedInstancesOffering;
+import com.amazon.ec2.PurchaseReservedInstancesOfferingResponse;
+import com.amazon.ec2.RebootInstances;
+import com.amazon.ec2.RebootInstancesResponse;
+import com.amazon.ec2.RegisterImage;
+import com.amazon.ec2.RegisterImageResponse;
+import com.amazon.ec2.ReleaseAddress;
+import com.amazon.ec2.ReleaseAddressResponse;
+import com.amazon.ec2.ReplaceNetworkAclAssociation;
+import com.amazon.ec2.ReplaceNetworkAclAssociationResponse;
+import com.amazon.ec2.ReplaceNetworkAclEntry;
+import com.amazon.ec2.ReplaceNetworkAclEntryResponse;
+import com.amazon.ec2.ReplaceRoute;
+import com.amazon.ec2.ReplaceRouteResponse;
+import com.amazon.ec2.ReplaceRouteTableAssociation;
+import com.amazon.ec2.ReplaceRouteTableAssociationResponse;
+import com.amazon.ec2.ReportInstanceStatus;
+import com.amazon.ec2.ReportInstanceStatusResponse;
+import com.amazon.ec2.RequestSpotInstances;
+import com.amazon.ec2.RequestSpotInstancesResponse;
+import com.amazon.ec2.ResetImageAttribute;
+import com.amazon.ec2.ResetImageAttributeResponse;
+import com.amazon.ec2.ResetInstanceAttribute;
+import com.amazon.ec2.ResetInstanceAttributeResponse;
+import com.amazon.ec2.ResetNetworkInterfaceAttribute;
+import com.amazon.ec2.ResetNetworkInterfaceAttributeResponse;
+import com.amazon.ec2.ResetSnapshotAttribute;
+import com.amazon.ec2.ResetSnapshotAttributeResponse;
+import com.amazon.ec2.RevokeSecurityGroupEgress;
+import com.amazon.ec2.RevokeSecurityGroupEgressResponse;
+import com.amazon.ec2.RevokeSecurityGroupIngress;
+import com.amazon.ec2.RevokeSecurityGroupIngressResponse;
+import com.amazon.ec2.RunInstances;
+import com.amazon.ec2.RunInstancesResponse;
+import com.amazon.ec2.StartInstances;
+import com.amazon.ec2.StartInstancesResponse;
+import com.amazon.ec2.StopInstances;
+import com.amazon.ec2.StopInstancesResponse;
+import com.amazon.ec2.TerminateInstances;
+import com.amazon.ec2.TerminateInstancesResponse;
+import com.amazon.ec2.UnassignPrivateIpAddresses;
+import com.amazon.ec2.UnassignPrivateIpAddressesResponse;
+import com.amazon.ec2.UnmonitorInstances;
+import com.amazon.ec2.UnmonitorInstancesResponse;
+
import com.cloud.bridge.service.controller.s3.ServiceProvider;
public class EC2SoapService implements AmazonEC2SkeletonInterface {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
index f2fd4a6..dac18e4 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
@@ -26,35 +26,491 @@ import java.util.UUID;
import org.apache.commons.codec.binary.Base64;
-import com.amazon.ec2.*;
+import com.amazon.ec2.ActivateLicense;
+import com.amazon.ec2.ActivateLicenseResponse;
+import com.amazon.ec2.AllocateAddress;
+import com.amazon.ec2.AllocateAddressResponse;
+import com.amazon.ec2.AllocateAddressResponseType;
+import com.amazon.ec2.AmazonEC2SkeletonInterface;
+import com.amazon.ec2.AssignPrivateIpAddresses;
+import com.amazon.ec2.AssignPrivateIpAddressesResponse;
+import com.amazon.ec2.AssociateAddress;
+import com.amazon.ec2.AssociateAddressResponse;
+import com.amazon.ec2.AssociateAddressResponseType;
+import com.amazon.ec2.AssociateDhcpOptions;
+import com.amazon.ec2.AssociateDhcpOptionsResponse;
+import com.amazon.ec2.AssociateRouteTable;
+import com.amazon.ec2.AssociateRouteTableResponse;
+import com.amazon.ec2.AttachInternetGateway;
+import com.amazon.ec2.AttachInternetGatewayResponse;
+import com.amazon.ec2.AttachNetworkInterface;
+import com.amazon.ec2.AttachNetworkInterfaceResponse;
+import com.amazon.ec2.AttachVolume;
+import com.amazon.ec2.AttachVolumeResponse;
+import com.amazon.ec2.AttachVolumeResponseType;
+import com.amazon.ec2.AttachVolumeType;
+import com.amazon.ec2.AttachVpnGateway;
+import com.amazon.ec2.AttachVpnGatewayResponse;
+import com.amazon.ec2.AttachmentSetItemResponseType;
+import com.amazon.ec2.AttachmentSetResponseType;
+import com.amazon.ec2.AttributeValueType;
+import com.amazon.ec2.AuthorizeSecurityGroupEgress;
+import com.amazon.ec2.AuthorizeSecurityGroupEgressResponse;
+import com.amazon.ec2.AuthorizeSecurityGroupIngress;
+import com.amazon.ec2.AuthorizeSecurityGroupIngressResponse;
+import com.amazon.ec2.AuthorizeSecurityGroupIngressResponseType;
+import com.amazon.ec2.AuthorizeSecurityGroupIngressType;
+import com.amazon.ec2.AvailabilityZoneItemType;
+import com.amazon.ec2.AvailabilityZoneMessageSetType;
+import com.amazon.ec2.AvailabilityZoneMessageType;
+import com.amazon.ec2.AvailabilityZoneSetType;
+import com.amazon.ec2.BlockDeviceMappingItemType;
+import com.amazon.ec2.BlockDeviceMappingItemTypeChoice_type0;
+import com.amazon.ec2.BlockDeviceMappingType;
+import com.amazon.ec2.BundleInstance;
+import com.amazon.ec2.BundleInstanceResponse;
+import com.amazon.ec2.CancelBundleTask;
+import com.amazon.ec2.CancelBundleTaskResponse;
+import com.amazon.ec2.CancelConversionTask;
+import com.amazon.ec2.CancelConversionTaskResponse;
+import com.amazon.ec2.CancelExportTask;
+import com.amazon.ec2.CancelExportTaskResponse;
+import com.amazon.ec2.CancelReservedInstancesListing;
+import com.amazon.ec2.CancelReservedInstancesListingResponse;
+import com.amazon.ec2.CancelSpotInstanceRequests;
+import com.amazon.ec2.CancelSpotInstanceRequestsResponse;
+import com.amazon.ec2.ConfirmProductInstance;
+import com.amazon.ec2.ConfirmProductInstanceResponse;
+import com.amazon.ec2.CreateCustomerGateway;
+import com.amazon.ec2.CreateCustomerGatewayResponse;
+import com.amazon.ec2.CreateDhcpOptions;
+import com.amazon.ec2.CreateDhcpOptionsResponse;
+import com.amazon.ec2.CreateImage;
+import com.amazon.ec2.CreateImageResponse;
+import com.amazon.ec2.CreateImageResponseType;
+import com.amazon.ec2.CreateImageType;
+import com.amazon.ec2.CreateInstanceExportTask;
+import com.amazon.ec2.CreateInstanceExportTaskResponse;
+import com.amazon.ec2.CreateInternetGateway;
+import com.amazon.ec2.CreateInternetGatewayResponse;
+import com.amazon.ec2.CreateKeyPair;
+import com.amazon.ec2.CreateKeyPairResponse;
+import com.amazon.ec2.CreateKeyPairResponseType;
+import com.amazon.ec2.CreateNetworkAcl;
+import com.amazon.ec2.CreateNetworkAclEntry;
+import com.amazon.ec2.CreateNetworkAclEntryResponse;
+import com.amazon.ec2.CreateNetworkAclResponse;
+import com.amazon.ec2.CreateNetworkInterface;
+import com.amazon.ec2.CreateNetworkInterfaceResponse;
+import com.amazon.ec2.CreatePlacementGroup;
+import com.amazon.ec2.CreatePlacementGroupResponse;
+import com.amazon.ec2.CreateReservedInstancesListing;
+import com.amazon.ec2.CreateReservedInstancesListingResponse;
+import com.amazon.ec2.CreateRoute;
+import com.amazon.ec2.CreateRouteResponse;
+import com.amazon.ec2.CreateRouteTable;
+import com.amazon.ec2.CreateRouteTableResponse;
+import com.amazon.ec2.CreateSecurityGroup;
+import com.amazon.ec2.CreateSecurityGroupResponse;
+import com.amazon.ec2.CreateSecurityGroupResponseType;
+import com.amazon.ec2.CreateSecurityGroupType;
+import com.amazon.ec2.CreateSnapshot;
+import com.amazon.ec2.CreateSnapshotResponse;
+import com.amazon.ec2.CreateSnapshotResponseType;
+import com.amazon.ec2.CreateSnapshotType;
+import com.amazon.ec2.CreateSpotDatafeedSubscription;
+import com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse;
+import com.amazon.ec2.CreateSubnet;
+import com.amazon.ec2.CreateSubnetResponse;
+import com.amazon.ec2.CreateTags;
+import com.amazon.ec2.CreateTagsResponse;
+import com.amazon.ec2.CreateTagsResponseType;
+import com.amazon.ec2.CreateTagsType;
+import com.amazon.ec2.CreateVolume;
+import com.amazon.ec2.CreateVolumeResponse;
+import com.amazon.ec2.CreateVolumeResponseType;
+import com.amazon.ec2.CreateVolumeType;
+import com.amazon.ec2.CreateVpc;
+import com.amazon.ec2.CreateVpcResponse;
+import com.amazon.ec2.CreateVpnConnection;
+import com.amazon.ec2.CreateVpnConnectionResponse;
+import com.amazon.ec2.CreateVpnConnectionRoute;
+import com.amazon.ec2.CreateVpnConnectionRouteResponse;
+import com.amazon.ec2.CreateVpnGateway;
+import com.amazon.ec2.CreateVpnGatewayResponse;
+import com.amazon.ec2.DeactivateLicense;
+import com.amazon.ec2.DeactivateLicenseResponse;
+import com.amazon.ec2.DeleteCustomerGateway;
+import com.amazon.ec2.DeleteCustomerGatewayResponse;
+import com.amazon.ec2.DeleteDhcpOptions;
+import com.amazon.ec2.DeleteDhcpOptionsResponse;
+import com.amazon.ec2.DeleteInternetGateway;
+import com.amazon.ec2.DeleteInternetGatewayResponse;
+import com.amazon.ec2.DeleteKeyPair;
+import com.amazon.ec2.DeleteKeyPairResponse;
+import com.amazon.ec2.DeleteKeyPairResponseType;
+import com.amazon.ec2.DeleteNetworkAcl;
+import com.amazon.ec2.DeleteNetworkAclEntry;
+import com.amazon.ec2.DeleteNetworkAclEntryResponse;
+import com.amazon.ec2.DeleteNetworkAclResponse;
+import com.amazon.ec2.DeleteNetworkInterface;
+import com.amazon.ec2.DeleteNetworkInterfaceResponse;
+import com.amazon.ec2.DeletePlacementGroup;
+import com.amazon.ec2.DeletePlacementGroupResponse;
+import com.amazon.ec2.DeleteRoute;
+import com.amazon.ec2.DeleteRouteResponse;
+import com.amazon.ec2.DeleteRouteTable;
+import com.amazon.ec2.DeleteRouteTableResponse;
+import com.amazon.ec2.DeleteSecurityGroup;
+import com.amazon.ec2.DeleteSecurityGroupResponse;
+import com.amazon.ec2.DeleteSecurityGroupResponseType;
+import com.amazon.ec2.DeleteSecurityGroupType;
+import com.amazon.ec2.DeleteSnapshot;
+import com.amazon.ec2.DeleteSnapshotResponse;
+import com.amazon.ec2.DeleteSnapshotResponseType;
+import com.amazon.ec2.DeleteSnapshotType;
+import com.amazon.ec2.DeleteSpotDatafeedSubscription;
+import com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponse;
+import com.amazon.ec2.DeleteSubnet;
+import com.amazon.ec2.DeleteSubnetResponse;
+import com.amazon.ec2.DeleteTags;
+import com.amazon.ec2.DeleteTagsResponse;
+import com.amazon.ec2.DeleteTagsResponseType;
+import com.amazon.ec2.DeleteTagsSetItemType;
+import com.amazon.ec2.DeleteTagsSetType;
+import com.amazon.ec2.DeleteTagsType;
+import com.amazon.ec2.DeleteVolume;
+import com.amazon.ec2.DeleteVolumeResponse;
+import com.amazon.ec2.DeleteVolumeResponseType;
+import com.amazon.ec2.DeleteVolumeType;
+import com.amazon.ec2.DeleteVpc;
+import com.amazon.ec2.DeleteVpcResponse;
+import com.amazon.ec2.DeleteVpnConnection;
+import com.amazon.ec2.DeleteVpnConnectionResponse;
+import com.amazon.ec2.DeleteVpnConnectionRoute;
+import com.amazon.ec2.DeleteVpnConnectionRouteResponse;
+import com.amazon.ec2.DeleteVpnGateway;
+import com.amazon.ec2.DeleteVpnGatewayResponse;
+import com.amazon.ec2.DeregisterImage;
+import com.amazon.ec2.DeregisterImageResponse;
+import com.amazon.ec2.DeregisterImageResponseType;
+import com.amazon.ec2.DeregisterImageType;
+import com.amazon.ec2.DescribeAddresses;
+import com.amazon.ec2.DescribeAddressesInfoType;
+import com.amazon.ec2.DescribeAddressesItemType;
+import com.amazon.ec2.DescribeAddressesResponse;
+import com.amazon.ec2.DescribeAddressesResponseInfoType;
+import com.amazon.ec2.DescribeAddressesResponseItemType;
+import com.amazon.ec2.DescribeAddressesResponseType;
+import com.amazon.ec2.DescribeAddressesType;
+import com.amazon.ec2.DescribeAvailabilityZones;
+import com.amazon.ec2.DescribeAvailabilityZonesResponse;
+import com.amazon.ec2.DescribeAvailabilityZonesResponseType;
+import com.amazon.ec2.DescribeAvailabilityZonesSetItemType;
+import com.amazon.ec2.DescribeAvailabilityZonesSetType;
+import com.amazon.ec2.DescribeAvailabilityZonesType;
+import com.amazon.ec2.DescribeBundleTasks;
+import com.amazon.ec2.DescribeBundleTasksResponse;
+import com.amazon.ec2.DescribeConversionTasks;
+import com.amazon.ec2.DescribeConversionTasksResponse;
+import com.amazon.ec2.DescribeCustomerGateways;
+import com.amazon.ec2.DescribeCustomerGatewaysResponse;
+import com.amazon.ec2.DescribeDhcpOptions;
+import com.amazon.ec2.DescribeDhcpOptionsResponse;
+import com.amazon.ec2.DescribeExportTasks;
+import com.amazon.ec2.DescribeExportTasksResponse;
+import com.amazon.ec2.DescribeImageAttribute;
+import com.amazon.ec2.DescribeImageAttributeResponse;
+import com.amazon.ec2.DescribeImageAttributeResponseType;
+import com.amazon.ec2.DescribeImageAttributeResponseTypeChoice_type0;
+import com.amazon.ec2.DescribeImageAttributeType;
+import com.amazon.ec2.DescribeImageAttributesGroup;
+import com.amazon.ec2.DescribeImages;
+import com.amazon.ec2.DescribeImagesExecutableBySetType;
+import com.amazon.ec2.DescribeImagesExecutableByType;
+import com.amazon.ec2.DescribeImagesInfoType;
+import com.amazon.ec2.DescribeImagesItemType;
+import com.amazon.ec2.DescribeImagesOwnerType;
+import com.amazon.ec2.DescribeImagesOwnersType;
+import com.amazon.ec2.DescribeImagesResponse;
+import com.amazon.ec2.DescribeImagesResponseInfoType;
+import com.amazon.ec2.DescribeImagesResponseItemType;
+import com.amazon.ec2.DescribeImagesResponseType;
+import com.amazon.ec2.DescribeImagesType;
+import com.amazon.ec2.DescribeInstanceAttribute;
+import com.amazon.ec2.DescribeInstanceAttributeResponse;
+import com.amazon.ec2.DescribeInstanceAttributeResponseType;
+import com.amazon.ec2.DescribeInstanceAttributeResponseTypeChoice_type0;
+import com.amazon.ec2.DescribeInstanceAttributeType;
+import com.amazon.ec2.DescribeInstanceAttributesGroup;
+import com.amazon.ec2.DescribeInstanceStatus;
+import com.amazon.ec2.DescribeInstanceStatusResponse;
+import com.amazon.ec2.DescribeInstances;
+import com.amazon.ec2.DescribeInstancesInfoType;
+import com.amazon.ec2.DescribeInstancesItemType;
+import com.amazon.ec2.DescribeInstancesResponse;
+import com.amazon.ec2.DescribeInstancesResponseType;
+import com.amazon.ec2.DescribeInstancesType;
+import com.amazon.ec2.DescribeInternetGateways;
+import com.amazon.ec2.DescribeInternetGatewaysResponse;
+import com.amazon.ec2.DescribeKeyPairs;
+import com.amazon.ec2.DescribeKeyPairsInfoType;
+import com.amazon.ec2.DescribeKeyPairsItemType;
+import com.amazon.ec2.DescribeKeyPairsResponse;
+import com.amazon.ec2.DescribeKeyPairsResponseInfoType;
+import com.amazon.ec2.DescribeKeyPairsResponseItemType;
+import com.amazon.ec2.DescribeKeyPairsResponseType;
+import com.amazon.ec2.DescribeLicenses;
+import com.amazon.ec2.DescribeLicensesResponse;
+import com.amazon.ec2.DescribeNetworkAcls;
+import com.amazon.ec2.DescribeNetworkAclsResponse;
+import com.amazon.ec2.DescribeNetworkInterfaceAttribute;
+import com.amazon.ec2.DescribeNetworkInterfaceAttributeResponse;
+import com.amazon.ec2.DescribeNetworkInterfaces;
+import com.amazon.ec2.DescribeNetworkInterfacesResponse;
+import com.amazon.ec2.DescribePlacementGroups;
+import com.amazon.ec2.DescribePlacementGroupsResponse;
+import com.amazon.ec2.DescribeRegions;
+import com.amazon.ec2.DescribeRegionsResponse;
+import com.amazon.ec2.DescribeReservedInstances;
+import com.amazon.ec2.DescribeReservedInstancesListings;
+import com.amazon.ec2.DescribeReservedInstancesListingsResponse;
+import com.amazon.ec2.DescribeReservedInstancesOfferings;
+import com.amazon.ec2.DescribeReservedInstancesOfferingsResponse;
+import com.amazon.ec2.DescribeReservedInstancesResponse;
+import com.amazon.ec2.DescribeRouteTables;
+import com.amazon.ec2.DescribeRouteTablesResponse;
+import com.amazon.ec2.DescribeSecurityGroups;
+import com.amazon.ec2.DescribeSecurityGroupsResponse;
+import com.amazon.ec2.DescribeSecurityGroupsResponseType;
+import com.amazon.ec2.DescribeSecurityGroupsSetItemType;
+import com.amazon.ec2.DescribeSecurityGroupsSetType;
+import com.amazon.ec2.DescribeSecurityGroupsType;
+import com.amazon.ec2.DescribeSnapshotAttribute;
+import com.amazon.ec2.DescribeSnapshotAttributeResponse;
+import com.amazon.ec2.DescribeSnapshots;
+import com.amazon.ec2.DescribeSnapshotsResponse;
+import com.amazon.ec2.DescribeSnapshotsResponseType;
+import com.amazon.ec2.DescribeSnapshotsSetItemResponseType;
+import com.amazon.ec2.DescribeSnapshotsSetItemType;
+import com.amazon.ec2.DescribeSnapshotsSetResponseType;
+import com.amazon.ec2.DescribeSnapshotsSetType;
+import com.amazon.ec2.DescribeSnapshotsType;
+import com.amazon.ec2.DescribeSpotDatafeedSubscription;
+import com.amazon.ec2.DescribeSpotDatafeedSubscriptionResponse;
+import com.amazon.ec2.DescribeSpotInstanceRequests;
+import com.amazon.ec2.DescribeSpotInstanceRequestsResponse;
+import com.amazon.ec2.DescribeSpotPriceHistory;
+import com.amazon.ec2.DescribeSpotPriceHistoryResponse;
+import com.amazon.ec2.DescribeSubnets;
+import com.amazon.ec2.DescribeSubnetsResponse;
+import com.amazon.ec2.DescribeTags;
+import com.amazon.ec2.DescribeTagsResponse;
+import com.amazon.ec2.DescribeTagsResponseType;
+import com.amazon.ec2.DescribeTagsType;
+import com.amazon.ec2.DescribeVolumeAttribute;
+import com.amazon.ec2.DescribeVolumeAttributeResponse;
+import com.amazon.ec2.DescribeVolumeStatus;
+import com.amazon.ec2.DescribeVolumeStatusResponse;
+import com.amazon.ec2.DescribeVolumes;
+import com.amazon.ec2.DescribeVolumesResponse;
+import com.amazon.ec2.DescribeVolumesResponseType;
+import com.amazon.ec2.DescribeVolumesSetItemResponseType;
+import com.amazon.ec2.DescribeVolumesSetItemType;
+import com.amazon.ec2.DescribeVolumesSetResponseType;
+import com.amazon.ec2.DescribeVolumesSetType;
+import com.amazon.ec2.DescribeVolumesType;
+import com.amazon.ec2.DescribeVpcs;
+import com.amazon.ec2.DescribeVpcsResponse;
+import com.amazon.ec2.DescribeVpnConnections;
+import com.amazon.ec2.DescribeVpnConnectionsResponse;
+import com.amazon.ec2.DescribeVpnGateways;
+import com.amazon.ec2.DescribeVpnGatewaysResponse;
+import com.amazon.ec2.DetachInternetGateway;
+import com.amazon.ec2.DetachInternetGatewayResponse;
+import com.amazon.ec2.DetachNetworkInterface;
+import com.amazon.ec2.DetachNetworkInterfaceResponse;
+import com.amazon.ec2.DetachVolume;
+import com.amazon.ec2.DetachVolumeResponse;
+import com.amazon.ec2.DetachVolumeResponseType;
+import com.amazon.ec2.DetachVolumeType;
+import com.amazon.ec2.DetachVpnGateway;
+import com.amazon.ec2.DetachVpnGatewayResponse;
+import com.amazon.ec2.DisableVgwRoutePropagation;
+import com.amazon.ec2.DisableVgwRoutePropagationResponse;
+import com.amazon.ec2.DisassociateAddress;
+import com.amazon.ec2.DisassociateAddressResponse;
+import com.amazon.ec2.DisassociateAddressResponseType;
+import com.amazon.ec2.DisassociateRouteTable;
+import com.amazon.ec2.DisassociateRouteTableResponse;
+import com.amazon.ec2.EbsBlockDeviceType;
+import com.amazon.ec2.EmptyElementType;
+import com.amazon.ec2.EnableVgwRoutePropagation;
+import com.amazon.ec2.EnableVgwRoutePropagationResponse;
+import com.amazon.ec2.EnableVolumeIO;
+import com.amazon.ec2.EnableVolumeIOResponse;
+import com.amazon.ec2.FilterSetType;
+import com.amazon.ec2.FilterType;
+import com.amazon.ec2.GetConsoleOutput;
+import com.amazon.ec2.GetConsoleOutputResponse;
+import com.amazon.ec2.GetPasswordData;
+import com.amazon.ec2.GetPasswordDataResponse;
+import com.amazon.ec2.GetPasswordDataResponseType;
+import com.amazon.ec2.GroupItemType;
+import com.amazon.ec2.GroupSetType;
+import com.amazon.ec2.ImportInstance;
+import com.amazon.ec2.ImportInstanceResponse;
+import com.amazon.ec2.ImportKeyPair;
+import com.amazon.ec2.ImportKeyPairResponse;
+import com.amazon.ec2.ImportKeyPairResponseType;
+import com.amazon.ec2.ImportVolume;
+import com.amazon.ec2.ImportVolumeResponse;
+import com.amazon.ec2.InstanceIdSetType;
+import com.amazon.ec2.InstanceIdType;
+import com.amazon.ec2.InstanceMonitoringStateType;
+import com.amazon.ec2.InstanceStateChangeSetType;
+import com.amazon.ec2.InstanceStateChangeType;
+import com.amazon.ec2.InstanceStateType;
+import com.amazon.ec2.IpPermissionSetType;
+import com.amazon.ec2.IpPermissionType;
+import com.amazon.ec2.IpRangeItemType;
+import com.amazon.ec2.IpRangeSetType;
+import com.amazon.ec2.LaunchPermissionItemType;
+import com.amazon.ec2.LaunchPermissionListType;
+import com.amazon.ec2.LaunchPermissionOperationType;
+import com.amazon.ec2.ModifyImageAttribute;
+import com.amazon.ec2.ModifyImageAttributeResponse;
+import com.amazon.ec2.ModifyImageAttributeResponseType;
+import com.amazon.ec2.ModifyImageAttributeType;
+import com.amazon.ec2.ModifyImageAttributeTypeChoice_type0;
+import com.amazon.ec2.ModifyInstanceAttribute;
+import com.amazon.ec2.ModifyInstanceAttributeResponse;
+import com.amazon.ec2.ModifyInstanceAttributeResponseType;
+import com.amazon.ec2.ModifyInstanceAttributeType;
+import com.amazon.ec2.ModifyInstanceAttributeTypeChoice_type0;
+import com.amazon.ec2.ModifyNetworkInterfaceAttribute;
+import com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse;
+import com.amazon.ec2.ModifySnapshotAttribute;
+import com.amazon.ec2.ModifySnapshotAttributeResponse;
+import com.amazon.ec2.ModifyVolumeAttribute;
+import com.amazon.ec2.ModifyVolumeAttributeResponse;
+import com.amazon.ec2.MonitorInstances;
+import com.amazon.ec2.MonitorInstancesResponse;
+import com.amazon.ec2.MonitorInstancesResponseSetItemType;
+import com.amazon.ec2.MonitorInstancesResponseSetType;
+import com.amazon.ec2.MonitorInstancesResponseType;
+import com.amazon.ec2.MonitorInstancesSetItemType;
+import com.amazon.ec2.MonitorInstancesSetType;
+import com.amazon.ec2.MonitorInstancesType;
+import com.amazon.ec2.NullableAttributeValueType;
+import com.amazon.ec2.PlacementRequestType;
+import com.amazon.ec2.PlacementResponseType;
+import com.amazon.ec2.ProductCodesSetItemType;
+import com.amazon.ec2.ProductCodesSetType;
+import com.amazon.ec2.PurchaseReservedInstancesOffering;
+import com.amazon.ec2.PurchaseReservedInstancesOfferingResponse;
+import com.amazon.ec2.RebootInstances;
+import com.amazon.ec2.RebootInstancesInfoType;
+import com.amazon.ec2.RebootInstancesItemType;
+import com.amazon.ec2.RebootInstancesResponse;
+import com.amazon.ec2.RebootInstancesResponseType;
+import com.amazon.ec2.RebootInstancesType;
+import com.amazon.ec2.RegisterImage;
+import com.amazon.ec2.RegisterImageResponse;
+import com.amazon.ec2.RegisterImageResponseType;
+import com.amazon.ec2.RegisterImageType;
+import com.amazon.ec2.ReleaseAddress;
+import com.amazon.ec2.ReleaseAddressResponse;
+import com.amazon.ec2.ReleaseAddressResponseType;
+import com.amazon.ec2.ReplaceNetworkAclAssociation;
+import com.amazon.ec2.ReplaceNetworkAclAssociationResponse;
+import com.amazon.ec2.ReplaceNetworkAclEntry;
+import com.amazon.ec2.ReplaceNetworkAclEntryResponse;
+import com.amazon.ec2.ReplaceRoute;
+import com.amazon.ec2.ReplaceRouteResponse;
+import com.amazon.ec2.ReplaceRouteTableAssociation;
+import com.amazon.ec2.ReplaceRouteTableAssociationResponse;
+import com.amazon.ec2.ReportInstanceStatus;
+import com.amazon.ec2.ReportInstanceStatusResponse;
+import com.amazon.ec2.RequestSpotInstances;
+import com.amazon.ec2.RequestSpotInstancesResponse;
+import com.amazon.ec2.ReservationInfoType;
+import com.amazon.ec2.ReservationSetType;
+import com.amazon.ec2.ResetImageAttribute;
+import com.amazon.ec2.ResetImageAttributeResponse;
+import com.amazon.ec2.ResetImageAttributeResponseType;
+import com.amazon.ec2.ResetImageAttributeType;
+import com.amazon.ec2.ResetInstanceAttribute;
+import com.amazon.ec2.ResetInstanceAttributeResponse;
+import com.amazon.ec2.ResetNetworkInterfaceAttribute;
+import com.amazon.ec2.ResetNetworkInterfaceAttributeResponse;
+import com.amazon.ec2.ResetSnapshotAttribute;
+import com.amazon.ec2.ResetSnapshotAttributeResponse;
+import com.amazon.ec2.ResourceIdSetItemType;
+import com.amazon.ec2.ResourceIdSetType;
+import com.amazon.ec2.ResourceTagSetItemType;
+import com.amazon.ec2.ResourceTagSetType;
+import com.amazon.ec2.RevokeSecurityGroupEgress;
+import com.amazon.ec2.RevokeSecurityGroupEgressResponse;
+import com.amazon.ec2.RevokeSecurityGroupIngress;
+import com.amazon.ec2.RevokeSecurityGroupIngressResponse;
+import com.amazon.ec2.RevokeSecurityGroupIngressResponseType;
+import com.amazon.ec2.RevokeSecurityGroupIngressType;
+import com.amazon.ec2.RunInstances;
+import com.amazon.ec2.RunInstancesResponse;
+import com.amazon.ec2.RunInstancesResponseType;
+import com.amazon.ec2.RunInstancesType;
+import com.amazon.ec2.RunningInstancesItemType;
+import com.amazon.ec2.RunningInstancesSetType;
+import com.amazon.ec2.SecurityGroupItemType;
+import com.amazon.ec2.SecurityGroupSetType;
+import com.amazon.ec2.StartInstances;
+import com.amazon.ec2.StartInstancesResponse;
+import com.amazon.ec2.StartInstancesResponseType;
+import com.amazon.ec2.StartInstancesType;
+import com.amazon.ec2.StateReasonType;
+import com.amazon.ec2.StopInstances;
+import com.amazon.ec2.StopInstancesResponse;
+import com.amazon.ec2.StopInstancesResponseType;
+import com.amazon.ec2.StopInstancesType;
+import com.amazon.ec2.TagSetItemType;
+import com.amazon.ec2.TagSetType;
+import com.amazon.ec2.TerminateInstances;
+import com.amazon.ec2.TerminateInstancesResponse;
+import com.amazon.ec2.TerminateInstancesResponseType;
+import com.amazon.ec2.TerminateInstancesType;
+import com.amazon.ec2.UnassignPrivateIpAddresses;
+import com.amazon.ec2.UnassignPrivateIpAddressesResponse;
+import com.amazon.ec2.UnmonitorInstances;
+import com.amazon.ec2.UnmonitorInstancesResponse;
+import com.amazon.ec2.UserDataType;
+import com.amazon.ec2.UserIdGroupPairSetType;
+import com.amazon.ec2.UserIdGroupPairType;
+import com.amazon.ec2.ValueSetType;
+import com.amazon.ec2.ValueType;
+
import com.cloud.bridge.service.core.ec2.EC2Address;
import com.cloud.bridge.service.core.ec2.EC2AddressFilterSet;
import com.cloud.bridge.service.core.ec2.EC2AssociateAddress;
import com.cloud.bridge.service.core.ec2.EC2AuthorizeRevokeSecurityGroup;
+import com.cloud.bridge.service.core.ec2.EC2AvailabilityZone;
import com.cloud.bridge.service.core.ec2.EC2AvailabilityZonesFilterSet;
import com.cloud.bridge.service.core.ec2.EC2CreateImage;
import com.cloud.bridge.service.core.ec2.EC2CreateImageResponse;
import com.cloud.bridge.service.core.ec2.EC2CreateKeyPair;
import com.cloud.bridge.service.core.ec2.EC2CreateVolume;
-import com.cloud.bridge.service.core.ec2.EC2Tags;
import com.cloud.bridge.service.core.ec2.EC2DeleteKeyPair;
import com.cloud.bridge.service.core.ec2.EC2DescribeAddresses;
import com.cloud.bridge.service.core.ec2.EC2DescribeAddressesResponse;
import com.cloud.bridge.service.core.ec2.EC2DescribeAvailabilityZones;
import com.cloud.bridge.service.core.ec2.EC2DescribeAvailabilityZonesResponse;
import com.cloud.bridge.service.core.ec2.EC2DescribeImageAttribute;
-
-import com.cloud.bridge.service.core.ec2.EC2AvailabilityZone;
import com.cloud.bridge.service.core.ec2.EC2DescribeImages;
import com.cloud.bridge.service.core.ec2.EC2DescribeImagesResponse;
import com.cloud.bridge.service.core.ec2.EC2DescribeInstances;
import com.cloud.bridge.service.core.ec2.EC2DescribeInstancesResponse;
import com.cloud.bridge.service.core.ec2.EC2DescribeKeyPairs;
import com.cloud.bridge.service.core.ec2.EC2DescribeKeyPairsResponse;
-import com.cloud.bridge.service.core.ec2.EC2ImageFilterSet;
-import com.cloud.bridge.service.core.ec2.EC2ImageLaunchPermission;
-import com.cloud.bridge.service.core.ec2.EC2ModifyInstanceAttribute;
-import com.cloud.bridge.service.core.ec2.EC2ResourceTag;
import com.cloud.bridge.service.core.ec2.EC2DescribeSecurityGroups;
import com.cloud.bridge.service.core.ec2.EC2DescribeSecurityGroupsResponse;
import com.cloud.bridge.service.core.ec2.EC2DescribeSnapshots;
@@ -70,18 +526,20 @@ import com.cloud.bridge.service.core.ec2.EC2GroupFilterSet;
import com.cloud.bridge.service.core.ec2.EC2Image;
import com.cloud.bridge.service.core.ec2.EC2ImageAttributes;
import com.cloud.bridge.service.core.ec2.EC2ImageAttributes.ImageAttribute;
+import com.cloud.bridge.service.core.ec2.EC2ImageFilterSet;
+import com.cloud.bridge.service.core.ec2.EC2ImageLaunchPermission;
import com.cloud.bridge.service.core.ec2.EC2ImportKeyPair;
import com.cloud.bridge.service.core.ec2.EC2Instance;
import com.cloud.bridge.service.core.ec2.EC2InstanceFilterSet;
import com.cloud.bridge.service.core.ec2.EC2IpPermission;
import com.cloud.bridge.service.core.ec2.EC2KeyPairFilterSet;
import com.cloud.bridge.service.core.ec2.EC2ModifyImageAttribute;
+import com.cloud.bridge.service.core.ec2.EC2ModifyInstanceAttribute;
import com.cloud.bridge.service.core.ec2.EC2PasswordData;
import com.cloud.bridge.service.core.ec2.EC2RebootInstances;
import com.cloud.bridge.service.core.ec2.EC2RegisterImage;
import com.cloud.bridge.service.core.ec2.EC2ReleaseAddress;
-import com.cloud.bridge.service.core.ec2.EC2TagKeyValue;
-import com.cloud.bridge.service.core.ec2.EC2TagTypeId;
+import com.cloud.bridge.service.core.ec2.EC2ResourceTag;
import com.cloud.bridge.service.core.ec2.EC2RunInstances;
import com.cloud.bridge.service.core.ec2.EC2RunInstancesResponse;
import com.cloud.bridge.service.core.ec2.EC2SSHKeyPair;
@@ -92,6 +550,9 @@ import com.cloud.bridge.service.core.ec2.EC2StartInstances;
import com.cloud.bridge.service.core.ec2.EC2StartInstancesResponse;
import com.cloud.bridge.service.core.ec2.EC2StopInstances;
import com.cloud.bridge.service.core.ec2.EC2StopInstancesResponse;
+import com.cloud.bridge.service.core.ec2.EC2TagKeyValue;
+import com.cloud.bridge.service.core.ec2.EC2TagTypeId;
+import com.cloud.bridge.service.core.ec2.EC2Tags;
import com.cloud.bridge.service.core.ec2.EC2TagsFilterSet;
import com.cloud.bridge.service.core.ec2.EC2Volume;
import com.cloud.bridge.service.core.ec2.EC2VolumeFilterSet;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/S3RestServlet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/S3RestServlet.java b/awsapi/src/com/cloud/bridge/service/S3RestServlet.java
index e001b25..70d6d0b 100644
--- a/awsapi/src/com/cloud/bridge/service/S3RestServlet.java
+++ b/awsapi/src/com/cloud/bridge/service/S3RestServlet.java
@@ -66,7 +66,6 @@ import com.cloud.bridge.util.HeaderParam;
import com.cloud.bridge.util.RestAuth;
import com.cloud.bridge.util.S3SoapAuth;
import com.cloud.utils.db.DB;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
public class S3RestServlet extends HttpServlet {
@@ -306,8 +305,8 @@ public class S3RestServlet extends HttpServlet {
return params;
}
- public static void authenticateRequest(HttpServletRequest request, S3AuthParams params) throws InstantiationException, IllegalAccessException, ClassNotFoundException,
- SQLException {
+ public static void authenticateRequest(HttpServletRequest request, S3AuthParams params) throws InstantiationException, IllegalAccessException,
+ ClassNotFoundException, SQLException {
RestAuth auth = new RestAuth(ServiceProvider.getInstance().getUseSubDomain());
String AWSAccessKey = null;
String signature = null;
[02/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/host/DetailVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/host/DetailVO.java b/engine/schema/src/com/cloud/host/DetailVO.java
index 21eac2c..1c781c6 100644
--- a/engine/schema/src/com/cloud/host/DetailVO.java
+++ b/engine/schema/src/com/cloud/host/DetailVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.host;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = "host_details")
public class DetailVO implements InternalIdentity {
@@ -67,6 +67,7 @@ public class DetailVO implements InternalIdentity {
this.value = value;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/host/HostTagVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/host/HostTagVO.java b/engine/schema/src/com/cloud/host/HostTagVO.java
index 2393006..6b8b754 100644
--- a/engine/schema/src/com/cloud/host/HostTagVO.java
+++ b/engine/schema/src/com/cloud/host/HostTagVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.host;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = "host_tags")
public class HostTagVO implements InternalIdentity {
@@ -59,6 +59,7 @@ public class HostTagVO implements InternalIdentity {
this.tag = tag;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/host/HostVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/host/HostVO.java b/engine/schema/src/com/cloud/host/HostVO.java
index 07b87a8..56c066b 100755
--- a/engine/schema/src/com/cloud/host/HostVO.java
+++ b/engine/schema/src/com/cloud/host/HostVO.java
@@ -37,13 +37,11 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
-import org.apache.cloudstack.api.Identity;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.resource.ResourceState;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.db.GenericDao;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = "host")
@@ -379,10 +377,10 @@ public class HostVO implements Host {
this.uuid = UUID.randomUUID().toString();
}
- public HostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress, String publicNetmask,
- String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String deuxStorageIpAddress, String duxStorageNetmask,
- String deuxStorageMacAddress, String guid, Status status, String version, String iqn, Date disconnectedOn, long dcId, Long podId, long serverId, long ping,
- String parent, long totalSize, StoragePoolType fsType) {
+ public HostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress,
+ String publicNetmask, String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String deuxStorageIpAddress,
+ String duxStorageNetmask, String deuxStorageMacAddress, String guid, Status status, String version, String iqn, Date disconnectedOn, long dcId, Long podId,
+ long serverId, long ping, String parent, long totalSize, StoragePoolType fsType) {
this(id,
name,
type,
@@ -415,9 +413,10 @@ public class HostVO implements Host {
this.uuid = UUID.randomUUID().toString();
}
- public HostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress, String publicNetmask,
- String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String guid, Status status, String version, String url,
- Date disconnectedOn, long dcId, Long podId, long serverId, long ping, Integer cpus, Long speed, Long totalMemory, long dom0MinMemory, String caps) {
+ public HostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress,
+ String publicNetmask, String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String guid, Status status,
+ String version, String url, Date disconnectedOn, long dcId, Long podId, long serverId, long ping, Integer cpus, Long speed, Long totalMemory,
+ long dom0MinMemory, String caps) {
this.id = id;
this.name = name;
this.status = status;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java b/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
index c51e2c7..08a4366 100755
--- a/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
+++ b/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
@@ -284,8 +284,8 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
JoinType.LEFTOUTER);
ClusterManagedSearch = _clusterDao.createSearchBuilder();
ClusterManagedSearch.and("managed", ClusterManagedSearch.entity().getManagedState(), SearchCriteria.Op.EQ);
- UnmanagedDirectConnectSearch.join("ClusterManagedSearch", ClusterManagedSearch, ClusterManagedSearch.entity().getId(),
- UnmanagedDirectConnectSearch.entity().getClusterId(), JoinType.INNER);
+ UnmanagedDirectConnectSearch.join("ClusterManagedSearch", ClusterManagedSearch, ClusterManagedSearch.entity().getId(), UnmanagedDirectConnectSearch.entity()
+ .getClusterId(), JoinType.INNER);
UnmanagedDirectConnectSearch.done();
DirectConnectSearch = createSearchBuilder();
@@ -733,7 +733,8 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
List<HostVO> result = new ArrayList<HostVO>();
ResultSet rs = null;
try {
- String sql = "select h.id from host h left join cluster c on h.cluster_id=c.id where h.mgmt_server_id is not null and h.last_ping < ? and h.status in ('Up', 'Updating', 'Disconnected', 'Connecting') and h.type not in ('ExternalFirewall', 'ExternalLoadBalancer', 'TrafficMonitor', 'SecondaryStorage', 'LocalSecondaryStorage', 'L2Networking') and (h.cluster_id is null or c.managed_state = 'Managed') ;";
+ String sql =
+ "select h.id from host h left join cluster c on h.cluster_id=c.id where h.mgmt_server_id is not null and h.last_ping < ? and h.status in ('Up', 'Updating', 'Disconnected', 'Connecting') and h.type not in ('ExternalFirewall', 'ExternalLoadBalancer', 'TrafficMonitor', 'SecondaryStorage', 'LocalSecondaryStorage', 'L2Networking') and (h.cluster_id is null or c.managed_state = 'Managed') ;";
pstmt = txn.prepareStatement(sql);
pstmt.setLong(1, timeout);
rs = pstmt.executeQuery();
@@ -824,10 +825,11 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
@Override
@DB
public List<RunningHostCountInfo> getRunningHostCounts(Date cutTime) {
- String sql = "select * from (" + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid "
- + "where h.status='Up' and h.type='SecondaryStorage' and m.last_update > ? " + "group by h.data_center_id, h.type " + "UNION ALL "
- + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid "
- + "where h.status='Up' and h.type='Routing' and m.last_update > ? " + "group by h.data_center_id, h.type) as t " + "ORDER by t.data_center_id, t.type";
+ String sql =
+ "select * from (" + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid "
+ + "where h.status='Up' and h.type='SecondaryStorage' and m.last_update > ? " + "group by h.data_center_id, h.type " + "UNION ALL "
+ + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid "
+ + "where h.status='Up' and h.type='Routing' and m.last_update > ? " + "group by h.data_center_id, h.type) as t " + "ORDER by t.data_center_id, t.type";
ArrayList<RunningHostCountInfo> l = new ArrayList<RunningHostCountInfo>();
@@ -946,7 +948,13 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
.append(":lastpinged=")
.append(host.getLastPinged())
.append("]");
- str.append("; Old=[status=").append(oldStatus.toString()).append(":msid=").append(host.getManagementServerId()).append(":lastpinged=").append(oldPingTime).append("]");
+ str.append("; Old=[status=")
+ .append(oldStatus.toString())
+ .append(":msid=")
+ .append(host.getManagementServerId())
+ .append(":lastpinged=")
+ .append(oldPingTime)
+ .append("]");
str.append("; DB=[status=")
.append(vo.getStatus().toString())
.append(":msid=")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/host/dao/HostTagsDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/host/dao/HostTagsDao.java b/engine/schema/src/com/cloud/host/dao/HostTagsDao.java
index 4f38782..50c0b7e 100644
--- a/engine/schema/src/com/cloud/host/dao/HostTagsDao.java
+++ b/engine/schema/src/com/cloud/host/dao/HostTagsDao.java
@@ -17,6 +17,7 @@
package com.cloud.host.dao;
import java.util.List;
+
import com.cloud.host.HostTagVO;
import com.cloud.utils.db.GenericDao;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java b/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java
index fd6e654..2deeb2e 100644
--- a/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java
+++ b/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java
@@ -27,10 +27,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import org.apache.cloudstack.api.Identity;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.utils.NumbersUtil;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = "hypervisor_capabilities")
@@ -72,7 +70,8 @@ public class HypervisorCapabilitiesVO implements HypervisorCapabilities {
this.uuid = UUID.randomUUID().toString();
}
- public HypervisorCapabilitiesVO(HypervisorType hypervisorType, String hypervisorVersion, Long maxGuestsLimit, boolean securityGroupEnabled, boolean storageMotionSupported) {
+ public HypervisorCapabilitiesVO(HypervisorType hypervisorType, String hypervisorVersion, Long maxGuestsLimit, boolean securityGroupEnabled,
+ boolean storageMotionSupported) {
this.hypervisorType = hypervisorType;
this.hypervisorVersion = hypervisorVersion;
this.maxGuestsLimit = maxGuestsLimit;
@@ -153,6 +152,7 @@ public class HypervisorCapabilitiesVO implements HypervisorCapabilities {
return storageMotionSupported;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java b/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java
index b5057f7..2b94e69 100644
--- a/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java
+++ b/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java
@@ -16,16 +16,18 @@
// under the License.
package com.cloud.hypervisor.dao;
+import java.util.List;
+
+import javax.ejb.Local;
+
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.hypervisor.HypervisorCapabilitiesVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
-import javax.ejb.Local;
-import java.util.List;
@Component
@Local(value = HypervisorCapabilitiesDao.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/keystore/KeystoreDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/keystore/KeystoreDaoImpl.java b/engine/schema/src/com/cloud/keystore/KeystoreDaoImpl.java
index 0d365fe..6c51a26 100644
--- a/engine/schema/src/com/cloud/keystore/KeystoreDaoImpl.java
+++ b/engine/schema/src/com/cloud/keystore/KeystoreDaoImpl.java
@@ -80,7 +80,8 @@ public class KeystoreDaoImpl extends GenericDaoBase<KeystoreVO, Long> implements
try {
txn.start();
- String sql = "INSERT INTO keystore (`name`, `certificate`, `key`, `domain_suffix`) VALUES (?, ?, ?, ?) ON DUPLICATE KEY UPDATE `certificate`=?, `key`=?, `domain_suffix`=?";
+ String sql =
+ "INSERT INTO keystore (`name`, `certificate`, `key`, `domain_suffix`) VALUES (?, ?, ?, ?) ON DUPLICATE KEY UPDATE `certificate`=?, `key`=?, `domain_suffix`=?";
PreparedStatement pstmt = txn.prepareAutoCloseStatement(sql);
pstmt.setString(1, name);
pstmt.setString(2, certificate);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/keystore/KeystoreVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/keystore/KeystoreVO.java b/engine/schema/src/com/cloud/keystore/KeystoreVO.java
index fd5c185..66dfac1 100644
--- a/engine/schema/src/com/cloud/keystore/KeystoreVO.java
+++ b/engine/schema/src/com/cloud/keystore/KeystoreVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.keystore;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = "keystore")
public class KeystoreVO implements InternalIdentity {
@@ -51,6 +51,7 @@ public class KeystoreVO implements InternalIdentity {
public KeystoreVO() {
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java b/engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java
index a3f00b7..f1e8fe8 100644
--- a/engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java
+++ b/engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java
@@ -16,11 +16,6 @@
// under the License.
package com.cloud.network;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
import java.util.UUID;
import javax.persistence.Column;
@@ -32,7 +27,6 @@ import javax.persistence.PrimaryKeyJoinColumn;
import javax.persistence.Table;
import com.cloud.network.rules.HealthCheckPolicy;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = ("load_balancer_healthcheck_policies"))
@@ -106,38 +100,47 @@ public class LBHealthCheckPolicyVO implements HealthCheckPolicy {
}
+ @Override
public int getResponseTime() {
return responseTime;
}
+ @Override
public int getHealthcheckInterval() {
return healthcheckInterval;
}
+ @Override
public int getHealthcheckThresshold() {
return healthcheckThresshold;
}
+ @Override
public int getUnhealthThresshold() {
return unhealthThresshold;
}
+ @Override
public long getId() {
return id;
}
+ @Override
public long getLoadBalancerId() {
return loadBalancerId;
}
+ @Override
public String getpingpath() {
return pingPath;
}
+ @Override
public String getDescription() {
return description;
}
+ @Override
public boolean isRevoke() {
return revoke;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/UserIpv6AddressVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/UserIpv6AddressVO.java b/engine/schema/src/com/cloud/network/UserIpv6AddressVO.java
index 264e415..3098a68 100644
--- a/engine/schema/src/com/cloud/network/UserIpv6AddressVO.java
+++ b/engine/schema/src/com/cloud/network/UserIpv6AddressVO.java
@@ -27,7 +27,6 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import javax.persistence.Transient;
import com.cloud.utils.db.GenericDao;
@@ -149,6 +148,7 @@ public class UserIpv6AddressVO implements UserIpv6Address {
this.state = state;
}
+ @Override
public String getMacAddress() {
return macAddress;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/VpnUserVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/VpnUserVO.java b/engine/schema/src/com/cloud/network/VpnUserVO.java
index 09c14ad..07b6326 100644
--- a/engine/schema/src/com/cloud/network/VpnUserVO.java
+++ b/engine/schema/src/com/cloud/network/VpnUserVO.java
@@ -27,9 +27,7 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import org.apache.cloudstack.api.Identity;
import com.cloud.utils.db.Encrypt;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = ("vpn_users"))
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java b/engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java
index 93905a5..834422f 100644
--- a/engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java
+++ b/engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.network.as;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = ("autoscale_policy_condition_map"))
public class AutoScalePolicyConditionMapVO implements InternalIdentity {
@@ -48,6 +48,7 @@ public class AutoScalePolicyConditionMapVO implements InternalIdentity {
this.conditionId = conditionId;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java b/engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java
index f8fbcb4..fbaf8e9 100644
--- a/engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java
+++ b/engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java
@@ -28,9 +28,10 @@ import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
-import com.cloud.utils.db.GenericDao;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.utils.db.GenericDao;
+
@Entity
@Table(name = "autoscale_policies")
@Inheritance(strategy = InheritanceType.JOINED)
@@ -87,6 +88,7 @@ public class AutoScalePolicyVO implements AutoScalePolicy, InternalIdentity {
return id;
}
+ @Override
public String getUuid() {
return uuid;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java
index 6bec99e..b275364 100644
--- a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java
+++ b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.network.as;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = ("autoscale_vmgroup_policy_map"))
public class AutoScaleVmGroupPolicyMapVO implements InternalIdentity {
@@ -51,6 +51,7 @@ public class AutoScaleVmGroupPolicyMapVO implements InternalIdentity {
this(vmgroupId, policyId);
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java
index d1d85f9..4eed086 100644
--- a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java
+++ b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java
@@ -28,9 +28,10 @@ import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
-import com.cloud.utils.db.GenericDao;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.utils.db.GenericDao;
+
@Entity
@Table(name = "autoscale_vmgroups")
@Inheritance(strategy = InheritanceType.JOINED)
@@ -83,7 +84,8 @@ public class AutoScaleVmGroupVO implements AutoScaleVmGroup, InternalIdentity {
public AutoScaleVmGroupVO() {
}
- public AutoScaleVmGroupVO(long lbRuleId, long zoneId, long domainId, long accountId, int minMembers, int maxMembers, int memberPort, int interval, long profileId, String state) {
+ public AutoScaleVmGroupVO(long lbRuleId, long zoneId, long domainId, long accountId, int minMembers, int maxMembers, int memberPort, int interval, long profileId,
+ String state) {
this.uuid = UUID.randomUUID().toString();
this.loadBalancerId = lbRuleId;
this.minMembers = minMembers;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java b/engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java
index a7ad532..ec643b0 100644
--- a/engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java
+++ b/engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java
@@ -34,10 +34,11 @@ import javax.persistence.InheritanceType;
import javax.persistence.Table;
import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
import com.cloud.utils.Pair;
import com.cloud.utils.db.GenericDao;
import com.cloud.utils.net.NetUtils;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = "autoscale_vmprofiles")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/ConditionVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/ConditionVO.java b/engine/schema/src/com/cloud/network/as/ConditionVO.java
index bbae72f..8d7e776 100644
--- a/engine/schema/src/com/cloud/network/as/ConditionVO.java
+++ b/engine/schema/src/com/cloud/network/as/ConditionVO.java
@@ -30,9 +30,10 @@ import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.cloudstack.api.Identity;
-import com.cloud.utils.db.GenericDao;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.utils.db.GenericDao;
+
@Entity
@Table(name = "conditions")
public class ConditionVO implements Condition, Identity, InternalIdentity {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/CounterVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/CounterVO.java b/engine/schema/src/com/cloud/network/as/CounterVO.java
index b7b03f7..2ba71f0 100644
--- a/engine/schema/src/com/cloud/network/as/CounterVO.java
+++ b/engine/schema/src/com/cloud/network/as/CounterVO.java
@@ -30,9 +30,10 @@ import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.cloudstack.api.Identity;
-import com.cloud.utils.db.GenericDao;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.utils.db.GenericDao;
+
@Entity
@Table(name = "counter")
public class CounterVO implements Counter, Identity, InternalIdentity {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java
index 9a614f4..5933f36 100644
--- a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java
@@ -47,6 +47,7 @@ public class AutoScalePolicyConditionMapDaoImpl extends GenericDaoBase<AutoScale
return listBy(getSearchCriteria(policyId, conditionId));
}
+ @Override
public boolean isConditionInUse(Long conditionId) {
return findOneBy(getSearchCriteria(null, conditionId)) != null;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java
index 692ce1a..684aaad 100644
--- a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java
@@ -28,6 +28,7 @@ import com.cloud.utils.db.SearchCriteria;
@Local(value = {AutoScalePolicyDao.class})
public class AutoScalePolicyDaoImpl extends GenericDaoBase<AutoScalePolicyVO, Long> implements AutoScalePolicyDao {
+ @Override
public int removeByAccountId(long accountId) {
SearchCriteria<AutoScalePolicyVO> sc = createSearchCriteria();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java
index 8235823..2bb8fd3 100644
--- a/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java
@@ -46,6 +46,7 @@ public class ConditionDaoImpl extends GenericDaoBase<ConditionVO, Long> implemen
return findOneBy(sc);
}
+ @Override
public int removeByAccountId(long accountId) {
SearchCriteria<ConditionVO> sc = createSearchCriteria();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDao.java b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDao.java
index dc1ec89..e3b223e 100644
--- a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDao.java
+++ b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDao.java
@@ -16,11 +16,10 @@
// under the License.
package com.cloud.network.dao;
-import com.cloud.network.dao.AccountGuestVlanMapVO;
-import com.cloud.utils.db.GenericDao;
-
import java.util.List;
+import com.cloud.utils.db.GenericDao;
+
public interface AccountGuestVlanMapDao extends GenericDao<AccountGuestVlanMapVO, Long> {
public List<AccountGuestVlanMapVO> listAccountGuestVlanMapsByAccount(long accountId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java
index 20fa5d0..a31798f 100644
--- a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java
@@ -16,11 +16,10 @@
// under the License.
package com.cloud.network.dao;
-import com.cloud.network.dao.AccountGuestVlanMapVO;
-import com.cloud.network.dao.AccountGuestVlanMapDao;
-
import java.util.List;
+
import javax.ejb.Local;
+
import org.springframework.stereotype.Component;
import com.cloud.utils.db.DB;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java
index 67227a7..4234c73 100644
--- a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java
+++ b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java
@@ -16,11 +16,17 @@
// under the License.
package com.cloud.network.dao;
-import com.cloud.network.GuestVlan;
-
-import javax.persistence.*;
import java.util.UUID;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.cloud.network.GuestVlan;
+
@Entity
@Table(name = "account_vnet_map")
public class AccountGuestVlanMapVO implements GuestVlan {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java
index c9334ef..11fa5ed 100644
--- a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java
@@ -17,6 +17,7 @@
package com.cloud.network.dao;
import java.util.List;
+
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@@ -77,7 +78,8 @@ public class ExternalFirewallDeviceDaoImpl extends GenericDaoBase<ExternalFirewa
}
@Override
- public List<ExternalFirewallDeviceVO> listByProviderAndDeviceAllocationState(long physicalNetworkId, String providerName, FirewallDeviceAllocationState allocationState) {
+ public List<ExternalFirewallDeviceVO> listByProviderAndDeviceAllocationState(long physicalNetworkId, String providerName,
+ FirewallDeviceAllocationState allocationState) {
SearchCriteria<ExternalFirewallDeviceVO> sc = allocationStateSearch.create();
sc.setParameters("physicalNetworkId", physicalNetworkId);
sc.setParameters("providerName", providerName);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java
index 76460a3..2e49ba8 100644
--- a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java
+++ b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java
@@ -16,9 +16,6 @@
// under the License.
package com.cloud.network.dao;
-import org.apache.cloudstack.api.Identity;
-import org.apache.cloudstack.api.InternalIdentity;
-
import java.util.UUID;
import javax.persistence.Column;
@@ -30,6 +27,9 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
/**
* ExternalFirewallDeviceVO contains information of a external firewall device (Juniper SRX) added into a deployment
*/
@@ -97,6 +97,7 @@ public class ExternalFirewallDeviceVO implements InternalIdentity, Identity {
this.uuid = UUID.randomUUID().toString();
}
+ @Override
public long getId() {
return id;
}
@@ -149,6 +150,7 @@ public class ExternalFirewallDeviceVO implements InternalIdentity, Identity {
isDedicatedDevice = isDedicated;
}
+ @Override
public String getUuid() {
return uuid;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java
index b7baa7e..b755598 100644
--- a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java
+++ b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java
@@ -16,12 +16,12 @@
// under the License.
package com.cloud.network.dao;
+import java.util.List;
+
import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState;
import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceState;
import com.cloud.utils.db.GenericDao;
-import java.util.List;
-
public interface ExternalLoadBalancerDeviceDao extends GenericDao<ExternalLoadBalancerDeviceVO, Long> {
/**
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java
index 88c0d37..f12d063 100644
--- a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java
@@ -16,6 +16,12 @@
// under the License.
package com.cloud.network.dao;
+import java.util.List;
+
+import javax.ejb.Local;
+
+import org.springframework.stereotype.Component;
+
import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState;
import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceState;
import com.cloud.utils.db.DB;
@@ -23,10 +29,6 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
-import org.springframework.stereotype.Component;
-
-import javax.ejb.Local;
-import java.util.List;
@Component
@Local(value = ExternalLoadBalancerDeviceDao.class)
@@ -76,6 +78,7 @@ public class ExternalLoadBalancerDeviceDaoImpl extends GenericDaoBase<ExternalLo
}
+ @Override
public List<ExternalLoadBalancerDeviceVO> listByPhysicalNetwork(long physicalNetworkId) {
SearchCriteria<ExternalLoadBalancerDeviceVO> sc = physicalNetworkIdSearch.create();
sc.setParameters("physicalNetworkId", physicalNetworkId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java
index e7222a8..8cc13fd 100644
--- a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java
+++ b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java
@@ -16,13 +16,21 @@
// under the License.
package com.cloud.network.dao;
+import java.util.UUID;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
import org.apache.cloudstack.network.ExternalNetworkDeviceManager;
-import javax.persistence.*;
-import java.util.UUID;
-
/**
* ExternalLoadBalancerDeviceVO contains information on external load balancer devices (F5/Netscaler VPX,MPX,SDX) added into a deployment
*/
@@ -92,7 +100,8 @@ public class ExternalLoadBalancerDeviceVO implements InternalIdentity, Identity
Provider // This state is set only for device that can dynamically provision LB appliances
}
- public ExternalLoadBalancerDeviceVO(long hostId, long physicalNetworkId, String provider_name, String device_name, long capacity, boolean dedicated, boolean gslbProvider) {
+ public ExternalLoadBalancerDeviceVO(long hostId, long physicalNetworkId, String provider_name, String device_name, long capacity, boolean dedicated,
+ boolean gslbProvider) {
this.physicalNetworkId = physicalNetworkId;
this.providerName = provider_name;
this.deviceName = device_name;
@@ -123,6 +132,7 @@ public class ExternalLoadBalancerDeviceVO implements InternalIdentity, Identity
this.uuid = UUID.randomUUID().toString();
}
+ @Override
public long getId() {
return id;
}
@@ -215,6 +225,7 @@ public class ExternalLoadBalancerDeviceVO implements InternalIdentity, Identity
return gslbSitePrivateIP;
}
+ @Override
public String getUuid() {
return uuid;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java b/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java
index d0aacff..e6871bb 100644
--- a/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java
+++ b/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.network.dao;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = ("firewall_rules_cidrs"))
public class FirewallRulesCidrsVO implements InternalIdentity {
@@ -47,6 +47,7 @@ public class FirewallRulesCidrsVO implements InternalIdentity {
this.sourceCidrList = sourceCidrList;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java b/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
index 44989dc..6a43486 100644
--- a/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
@@ -241,7 +241,8 @@ public class FirewallRulesDaoImpl extends GenericDaoBase<FirewallRuleVO, Long> i
}
@Override
- public List<FirewallRuleVO> listByIpPurposeAndProtocolAndNotRevoked(long ipAddressId, Integer startPort, Integer endPort, String protocol, FirewallRule.Purpose purpose) {
+ public List<FirewallRuleVO> listByIpPurposeAndProtocolAndNotRevoked(long ipAddressId, Integer startPort, Integer endPort, String protocol,
+ FirewallRule.Purpose purpose) {
SearchCriteria<FirewallRuleVO> sc = NotRevokedSearch.create();
sc.setParameters("ipId", ipAddressId);
sc.setParameters("state", State.Revoke);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/IPAddressDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressDao.java b/engine/schema/src/com/cloud/network/dao/IPAddressDao.java
index 5cc91e6..fb92cf9 100755
--- a/engine/schema/src/com/cloud/network/dao/IPAddressDao.java
+++ b/engine/schema/src/com/cloud/network/dao/IPAddressDao.java
@@ -16,14 +16,12 @@
// under the License.
package com.cloud.network.dao;
+import java.util.List;
+
import com.cloud.dc.Vlan.VlanType;
-import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDao;
import com.cloud.utils.net.Ip;
-import java.sql.SQLException;
-import java.util.List;
-
public interface IPAddressDao extends GenericDao<IPAddressVO, Long> {
IPAddressVO markAsUnavailable(long ipAddressId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
index 8ad3f70..97c4de1 100755
--- a/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
@@ -16,7 +16,18 @@
// under the License.
package com.cloud.network.dao;
-import com.cloud.dc.DataCenterVnetVO;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.Local;
+import javax.inject.Inject;
+
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
import com.cloud.dc.Vlan.VlanType;
import com.cloud.dc.VlanVO;
import com.cloud.dc.dao.VlanDao;
@@ -33,17 +44,6 @@ import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.net.Ip;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import javax.ejb.Local;
-import javax.inject.Inject;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Date;
-import java.util.List;
@Component
@Local(value = {IPAddressDao.class})
@@ -112,7 +112,8 @@ public class IPAddressDaoImpl extends GenericDaoBase<IPAddressVO, Long> implemen
SearchBuilder<VlanVO> virtaulNetworkVlan = _vlanDao.createSearchBuilder();
virtaulNetworkVlan.and("vlanType", virtaulNetworkVlan.entity().getVlanType(), SearchCriteria.Op.EQ);
- AllIpCountForDashboard.join("vlan", virtaulNetworkVlan, virtaulNetworkVlan.entity().getId(), AllIpCountForDashboard.entity().getVlanId(), JoinBuilder.JoinType.INNER);
+ AllIpCountForDashboard.join("vlan", virtaulNetworkVlan, virtaulNetworkVlan.entity().getId(), AllIpCountForDashboard.entity().getVlanId(),
+ JoinBuilder.JoinType.INNER);
virtaulNetworkVlan.done();
AllIpCountForDashboard.done();
@@ -289,7 +290,8 @@ public class IPAddressDaoImpl extends GenericDaoBase<IPAddressVO, Long> implemen
TransactionLegacy txn = TransactionLegacy.currentTxn();
int ipCount = 0;
try {
- String sql = "SELECT count(*) FROM user_ip_address u INNER JOIN vlan v on (u.vlan_db_id = v.id AND v.data_center_id = ? AND v.vlan_id = ? AND v.vlan_gateway = ? AND v.vlan_netmask = ? AND u.account_id = ?)";
+ String sql =
+ "SELECT count(*) FROM user_ip_address u INNER JOIN vlan v on (u.vlan_db_id = v.id AND v.data_center_id = ? AND v.vlan_id = ? AND v.vlan_gateway = ? AND v.vlan_netmask = ? AND u.account_id = ?)";
PreparedStatement pstmt = txn.prepareAutoCloseStatement(sql);
pstmt.setLong(1, dcId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/IPAddressVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressVO.java b/engine/schema/src/com/cloud/network/dao/IPAddressVO.java
index 3d4592d..d71a90f 100644
--- a/engine/schema/src/com/cloud/network/dao/IPAddressVO.java
+++ b/engine/schema/src/com/cloud/network/dao/IPAddressVO.java
@@ -253,6 +253,7 @@ public class IPAddressVO implements IpAddress {
return state;
}
+ @Override
public void setState(State state) {
this.state = state;
}
@@ -284,6 +285,7 @@ public class IPAddressVO implements IpAddress {
this.uuid = uuid;
}
+ @Override
public Long getPhysicalNetworkId() {
return physicalNetworkId;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java b/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java
index 2257149..3bfb076 100644
--- a/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java
+++ b/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.network.dao;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = ("inline_load_balancer_nic_map"))
public class InlineLoadBalancerNicMapVO implements InternalIdentity {
@@ -47,6 +47,7 @@ public class InlineLoadBalancerNicMapVO implements InternalIdentity {
this.nicId = nicId;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java b/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java
index d7c2bc2..6e8dfbb 100644
--- a/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java
+++ b/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java
@@ -30,9 +30,9 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.PrimaryKeyJoinColumn;
import javax.persistence.Table;
+
import com.cloud.network.rules.StickinessPolicy;
import com.cloud.utils.Pair;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = ("load_balancer_stickiness_policies"))
@@ -97,6 +97,7 @@ public class LBStickinessPolicyVO implements StickinessPolicy {
this.uuid = UUID.randomUUID().toString();
}
+ @Override
public List<Pair<String, String>> getParams() {
List<Pair<String, String>> paramsList = new ArrayList<Pair<String, String>>();
String[] params = paramsInDB.split("[=&]");
@@ -107,26 +108,32 @@ public class LBStickinessPolicyVO implements StickinessPolicy {
return paramsList;
}
+ @Override
public long getId() {
return id;
}
+ @Override
public long getLoadBalancerId() {
return loadBalancerId;
}
+ @Override
public String getName() {
return name;
}
+ @Override
public String getDescription() {
return description;
}
+ @Override
public String getMethodName() {
return methodName;
}
+ @Override
public boolean isRevoke() {
return revoke;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDao.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDao.java
index 1bd320c..1e038a1 100644
--- a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDao.java
+++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDao.java
@@ -16,11 +16,10 @@
// under the License.
package com.cloud.network.dao;
-import com.cloud.network.LBHealthCheckPolicyVO;
-import com.cloud.utils.db.GenericDao;
-
import java.util.List;
+import com.cloud.utils.db.GenericDao;
+
public interface LoadBalancerCertMapDao extends GenericDao<LoadBalancerCertMapVO, Long> {
List<LoadBalancerCertMapVO> listByCertId(Long certId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java
index b196961..c84b97d 100644
--- a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java
@@ -16,15 +16,16 @@
// under the License.
package com.cloud.network.dao;
+import java.util.List;
+
+import javax.ejb.Local;
+import javax.inject.Inject;
+
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.JoinBuilder;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import javax.ejb.Local;
-import javax.inject.Inject;
-import java.util.List;
-
@Local(value = {LoadBalancerCertMapDao.class})
public class LoadBalancerCertMapDaoImpl extends GenericDaoBase<LoadBalancerCertMapVO, Long> implements LoadBalancerCertMapDao {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java
index ea89246..f95c617 100644
--- a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java
+++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java
@@ -16,13 +16,14 @@
// under the License.
package com.cloud.network.dao;
-import org.apache.cloudstack.api.InternalIdentity;
+import java.util.UUID;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
-import java.util.UUID;
+
+import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = "load_balancer_cert_map")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java
index 27c8f79..0a67106 100644
--- a/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java
+++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.network.dao;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = ("load_balancer_vm_map"))
public class LoadBalancerVMMapVO implements InternalIdentity {
@@ -59,6 +59,7 @@ public class LoadBalancerVMMapVO implements InternalIdentity {
this.revoke = revoke;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java
index 88d83d4..865e7d2 100644
--- a/engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java
+++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java
@@ -65,8 +65,8 @@ public class LoadBalancerVO extends FirewallRuleVO implements LoadBalancer {
public LoadBalancerVO() {
}
- public LoadBalancerVO(String xId, String name, String description, long srcIpId, int srcPort, int dstPort, String algorithm, long networkId, long accountId, long domainId,
- String lbProtocol) {
+ public LoadBalancerVO(String xId, String name, String description, long srcIpId, int srcPort, int dstPort, String algorithm, long networkId, long accountId,
+ long domainId, String lbProtocol) {
super(xId, srcIpId, srcPort, NetUtils.TCP_PROTO, networkId, accountId, domainId, Purpose.LoadBalancing, null, null, null, null);
this.name = name;
this.description = description;
@@ -106,6 +106,7 @@ public class LoadBalancerVO extends FirewallRuleVO implements LoadBalancer {
this.name = name;
}
+ @Override
public String getLbProtocol() {
return lbProtocol;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDao.java b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDao.java
index 6856a91..66e2531 100644
--- a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDao.java
+++ b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDao.java
@@ -17,10 +17,10 @@
package com.cloud.network.dao;
-import com.cloud.utils.db.GenericDao;
-
import java.util.List;
+import com.cloud.utils.db.GenericDao;
+
public interface MonitoringServiceDao extends GenericDao<MonitoringServiceVO, Long> {
List<MonitoringServiceVO> listAllServices();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java
index 8a80627..c2292a2 100644
--- a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java
@@ -17,13 +17,15 @@
package com.cloud.network.dao;
+import java.util.List;
+
+import javax.ejb.Local;
+
+import org.springframework.stereotype.Component;
+
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import org.springframework.stereotype.Component;
-
-import javax.ejb.Local;
-import java.util.List;
@Component
@Local(value = MonitoringServiceDao.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java b/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java
index 62a6196..1d7ef14 100644
--- a/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java
+++ b/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java
@@ -16,11 +16,17 @@
// under the License.
package com.cloud.network.dao;
-import com.cloud.network.MonitoringService;
-
-import javax.persistence.*;
import java.util.UUID;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.cloud.network.MonitoringService;
+
@Entity
@Table(name = "monitoring_services")
public class MonitoringServiceVO implements MonitoringService {
@@ -64,6 +70,7 @@ public class MonitoringServiceVO implements MonitoringService {
@Column(name = "uuid")
String uuid = UUID.randomUUID().toString();
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java b/engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java
index 7c71dee..208d130 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java
@@ -23,9 +23,10 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import com.cloud.user.OwnedBy;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.user.OwnedBy;
+
@Entity
@Table(name = "account_network_ref")
public class NetworkAccountVO implements OwnedBy, InternalIdentity {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDao.java b/engine/schema/src/com/cloud/network/dao/NetworkDao.java
index e9405e9..6d49b0a 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkDao.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkDao.java
@@ -21,8 +21,8 @@ import java.util.Map;
import com.cloud.network.Network;
import com.cloud.network.Network.GuestType;
-import com.cloud.network.Networks.TrafficType;
import com.cloud.network.Network.State;
+import com.cloud.network.Networks.TrafficType;
import com.cloud.utils.db.GenericDao;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.fsm.StateDao;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java
index 5ead316..13fb64e 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java
@@ -25,15 +25,16 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.persistence.TableGenerator;
-import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.springframework.stereotype.Component;
+import org.apache.cloudstack.acl.ControlledEntity.ACLType;
+
import com.cloud.network.Network;
+import com.cloud.network.Network.Event;
import com.cloud.network.Network.GuestType;
import com.cloud.network.Network.Provider;
import com.cloud.network.Network.Service;
import com.cloud.network.Network.State;
-import com.cloud.network.Network.Event;
import com.cloud.network.Networks.BroadcastDomainType;
import com.cloud.network.Networks.Mode;
import com.cloud.network.Networks.TrafficType;
@@ -42,10 +43,17 @@ import com.cloud.offerings.NetworkOfferingVO;
import com.cloud.offerings.dao.NetworkOfferingDao;
import com.cloud.server.ResourceTag.ResourceObjectType;
import com.cloud.tags.dao.ResourceTagDao;
-import com.cloud.utils.db.*;
+import com.cloud.utils.db.DB;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.GenericSearchBuilder;
+import com.cloud.utils.db.JoinBuilder;
import com.cloud.utils.db.JoinBuilder.JoinType;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.utils.db.SearchCriteria.Op;
+import com.cloud.utils.db.SequenceFetcher;
+import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.net.NetUtils;
@Component
@@ -191,7 +199,8 @@ public class NetworkDaoImpl extends GenericDaoBase<NetworkVO, Long> implements N
SearchBuilder<NetworkAccountVO> join4 = _accountsDao.createSearchBuilder();
join4.and("account", join4.entity().getAccountId(), Op.EQ);
join4.and("isOwner", join4.entity().isOwner(), Op.EQ);
- NetworksRegularUserCanCreateSearch.join("accounts", join4, NetworksRegularUserCanCreateSearch.entity().getId(), join4.entity().getNetworkId(), JoinBuilder.JoinType.INNER);
+ NetworksRegularUserCanCreateSearch.join("accounts", join4, NetworksRegularUserCanCreateSearch.entity().getId(), join4.entity().getNetworkId(),
+ JoinBuilder.JoinType.INNER);
SearchBuilder<NetworkOfferingVO> join5 = _ntwkOffDao.createSearchBuilder();
join5.and("specifyVlan", join5.entity().getSpecifyVlan(), Op.EQ);
NetworksRegularUserCanCreateSearch.join("ntwkOff", join5, NetworksRegularUserCanCreateSearch.entity().getNetworkOfferingId(), join5.entity().getId(),
@@ -221,8 +230,8 @@ public class NetworkDaoImpl extends GenericDaoBase<NetworkVO, Long> implements N
OfferingAccountNetworkSearch.select(null, Func.DISTINCT, OfferingAccountNetworkSearch.entity().getId());
SearchBuilder<NetworkOfferingVO> ntwkOfferingJoin = _ntwkOffDao.createSearchBuilder();
ntwkOfferingJoin.and("isSystem", ntwkOfferingJoin.entity().isSystemOnly(), Op.EQ);
- OfferingAccountNetworkSearch.join("ntwkOfferingSearch", ntwkOfferingJoin, OfferingAccountNetworkSearch.entity().getNetworkOfferingId(), ntwkOfferingJoin.entity().getId(),
- JoinBuilder.JoinType.LEFT);
+ OfferingAccountNetworkSearch.join("ntwkOfferingSearch", ntwkOfferingJoin, OfferingAccountNetworkSearch.entity().getNetworkOfferingId(), ntwkOfferingJoin.entity()
+ .getId(), JoinBuilder.JoinType.LEFT);
SearchBuilder<NetworkAccountVO> ntwkAccountJoin = _accountsDao.createSearchBuilder();
ntwkAccountJoin.and("accountId", ntwkAccountJoin.entity().getAccountId(), Op.EQ);
OfferingAccountNetworkSearch.join("ntwkAccountSearch", ntwkAccountJoin, OfferingAccountNetworkSearch.entity().getId(), ntwkAccountJoin.entity().getNetworkId(),
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java
index 3ef6847..c4fb481 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java
@@ -18,9 +18,10 @@ package com.cloud.network.dao;
import javax.ejb.Local;
-import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
import org.springframework.stereotype.Component;
+import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
+
@Component
@Local(value = NetworkDetailsDao.class)
public class NetworkDetailsDaoImpl extends ResourceDetailsDaoBase<NetworkDetailVO> implements NetworkDetailsDao {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java
index 8d7eff3..e5ee255 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java
@@ -52,7 +52,7 @@ public class NetworkDomainDaoImpl extends GenericDaoBase<NetworkDomainVO, Long>
@Override
public List<NetworkDomainVO> listDomainNetworkMapByDomain(Object... domainId) {
SearchCriteria<NetworkDomainVO> sc = DomainsSearch.create();
- sc.setParameters("domainId", (Object[])domainId);
+ sc.setParameters("domainId", domainId);
return listBy(sc);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java b/engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java
index a3be08b..99cbb50 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java
@@ -23,9 +23,10 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import com.cloud.domain.PartOf;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.domain.PartOf;
+
@Entity
@Table(name = "domain_network_ref")
public class NetworkDomainVO implements PartOf, InternalIdentity {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java b/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java
index 096a09f..9cf9a61 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java
@@ -26,9 +26,10 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import com.cloud.utils.db.GenericDao;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.utils.db.GenericDao;
+
/**
* NetworkExternalFirewallVO contains information on the networks that are using external firewall
*/
@@ -66,6 +67,7 @@ public class NetworkExternalFirewallVO implements InternalIdentity {
this.uuid = UUID.randomUUID().toString();
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java b/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java
index 095a1ce..6ba5c8f 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java
@@ -26,9 +26,10 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import com.cloud.utils.db.GenericDao;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.utils.db.GenericDao;
+
/**
* NetworkExternalLoadBalancerVO contains mapping of a network and the external load balancer device id assigned to the network
*/
@@ -67,6 +68,7 @@ public class NetworkExternalLoadBalancerVO implements InternalIdentity {
this.uuid = UUID.randomUUID().toString();
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkOpDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkOpDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkOpDaoImpl.java
index 03a60e9..307b964 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkOpDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkOpDaoImpl.java
@@ -16,12 +16,9 @@
// under the License.
package com.cloud.network.dao;
-import java.util.List;
-
import org.springframework.stereotype.Component;
import com.cloud.utils.db.Attribute;
-import com.cloud.utils.db.GenericDao;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.SearchBuilder;
@@ -51,6 +48,7 @@ public class NetworkOpDaoImpl extends GenericDaoBase<NetworkOpVO, Long> implemen
assert _activeNicsAttribute != null : "Cannot find activeNicsCount";
}
+ @Override
public int getActiveNics(long networkId) {
SearchCriteria<Integer> sc = ActiveNicsSearch.create();
sc.setParameters("network", networkId);
@@ -58,6 +56,7 @@ public class NetworkOpDaoImpl extends GenericDaoBase<NetworkOpVO, Long> implemen
return customSearch(sc, null).get(0);
}
+ @Override
public void changeActiveNicsBy(long networkId, int count) {
SearchCriteria<NetworkOpVO> sc = AllFieldsSearch.create();
@@ -70,12 +69,14 @@ public class NetworkOpDaoImpl extends GenericDaoBase<NetworkOpVO, Long> implemen
update(builder, sc, null);
}
+ @Override
public void setCheckForGc(long networkId) {
NetworkOpVO vo = createForUpdate();
vo.setCheckForGc(true);
update(networkId, vo);
}
+ @Override
public void clearCheckForGc(long networkId) {
NetworkOpVO vo = createForUpdate();
vo.setCheckForGc(false);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkOpVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkOpVO.java b/engine/schema/src/com/cloud/network/dao/NetworkOpVO.java
index f237279..ea38116 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkOpVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkOpVO.java
@@ -16,13 +16,13 @@
// under the License.
package com.cloud.network.dao;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = "op_networks")
public class NetworkOpVO implements InternalIdentity {
@@ -50,6 +50,7 @@ public class NetworkOpVO implements InternalIdentity {
this.activeNicsCount = 0;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java
index 17281dc..ebb1eb2 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java
@@ -37,12 +37,14 @@ public class NetworkRuleConfigDaoImpl extends GenericDaoBase<NetworkRuleConfigVO
SecurityGroupIdSearch.done();
}
+ @Override
public List<NetworkRuleConfigVO> listBySecurityGroupId(long securityGroupId) {
SearchCriteria<NetworkRuleConfigVO> sc = SecurityGroupIdSearch.create();
sc.setParameters("securityGroupId", securityGroupId);
return listBy(sc);
}
+ @Override
public void deleteBySecurityGroup(long securityGroupId) {
SearchCriteria<NetworkRuleConfigVO> sc = SecurityGroupIdSearch.create();
sc.setParameters("securityGroupId", securityGroupId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java b/engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java
index 596c3ab..4e1e9af 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java
@@ -25,11 +25,11 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import com.cloud.network.Network;
+import org.apache.cloudstack.api.InternalIdentity;
+
import com.cloud.network.Network.Provider;
import com.cloud.network.Network.Service;
import com.cloud.utils.db.GenericDao;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = "ntwk_service_map")
@@ -51,6 +51,7 @@ public class NetworkServiceMapVO implements InternalIdentity {
@Column(name = GenericDao.CREATED_COLUMN)
Date created;
+ @Override
public long getId() {
return id;
}
@@ -80,6 +81,7 @@ public class NetworkServiceMapVO implements InternalIdentity {
this.provider = provider.getName();
}
+ @Override
public String toString() {
StringBuilder buf = new StringBuilder("[Network Service[");
return buf.append(networkId).append("-").append(service).append("-").append(provider).append("]").toString();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkVO.java b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
index 03960b8..f3776df 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
@@ -180,7 +180,8 @@ public class NetworkVO implements Network {
* @param dataCenterId
* @param physicalNetworkId TODO
*/
- public NetworkVO(TrafficType trafficType, Mode mode, BroadcastDomainType broadcastDomainType, long networkOfferingId, State state, long dataCenterId, Long physicalNetworkId) {
+ public NetworkVO(TrafficType trafficType, Mode mode, BroadcastDomainType broadcastDomainType, long networkOfferingId, State state, long dataCenterId,
+ Long physicalNetworkId) {
this.trafficType = trafficType;
this.mode = mode;
this.broadcastDomainType = broadcastDomainType;
@@ -196,8 +197,8 @@ public class NetworkVO implements Network {
this.uuid = UUID.randomUUID().toString();
}
- public NetworkVO(long id, Network that, long offeringId, String guruName, long domainId, long accountId, long related, String name, String displayText, String networkDomain,
- GuestType guestType, long dcId, Long physicalNetworkId, ACLType aclType, boolean specifyIpRanges, Long vpcId) {
+ public NetworkVO(long id, Network that, long offeringId, String guruName, long domainId, long accountId, long related, String name, String displayText,
+ String networkDomain, GuestType guestType, long dcId, Long physicalNetworkId, ACLType aclType, boolean specifyIpRanges, Long vpcId) {
this(id,
that.getTrafficType(),
that.getMode(),
@@ -247,8 +248,9 @@ public class NetworkVO implements Network {
* @param vpcId TODO
* @param dataCenterId
*/
- public NetworkVO(long id, TrafficType trafficType, Mode mode, BroadcastDomainType broadcastDomainType, long networkOfferingId, long domainId, long accountId, long related,
- String name, String displayText, String networkDomain, GuestType guestType, long dcId, Long physicalNetworkId, ACLType aclType, boolean specifyIpRanges, Long vpcId) {
+ public NetworkVO(long id, TrafficType trafficType, Mode mode, BroadcastDomainType broadcastDomainType, long networkOfferingId, long domainId, long accountId,
+ long related, String name, String displayText, String networkDomain, GuestType guestType, long dcId, Long physicalNetworkId, ACLType aclType,
+ boolean specifyIpRanges, Long vpcId) {
this(trafficType, mode, broadcastDomainType, networkOfferingId, State.Allocated, dcId, physicalNetworkId);
this.domainId = domainId;
this.accountId = accountId;
@@ -334,6 +336,7 @@ public class NetworkVO implements Network {
this.guruData = guruData;
}
+ @Override
public String getGuruName() {
return guruName;
}
@@ -360,6 +363,7 @@ public class NetworkVO implements Network {
return trafficType;
}
+ @Override
public void setTrafficType(TrafficType trafficType) {
this.trafficType = trafficType;
}
@@ -510,6 +514,7 @@ public class NetworkVO implements Network {
return buf.toString();
}
+ @Override
public String getUuid() {
return this.uuid;
}
@@ -518,6 +523,7 @@ public class NetworkVO implements Network {
this.uuid = uuid;
}
+ @Override
public ControlledEntity.ACLType getAclType() {
return aclType;
}
@@ -541,6 +547,7 @@ public class NetworkVO implements Network {
return vpcId;
}
+ @Override
public String getIp6Cidr() {
return ip6Cidr;
}
@@ -549,6 +556,7 @@ public class NetworkVO implements Network {
this.ip6Cidr = ip6Cidr;
}
+ @Override
public String getIp6Gateway() {
return ip6Gateway;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java
index 1da9cc1..11b4399 100644
--- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java
@@ -28,7 +28,8 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
-public class PhysicalNetworkIsolationMethodDaoImpl extends GenericDaoBase<PhysicalNetworkIsolationMethodVO, Long> implements GenericDao<PhysicalNetworkIsolationMethodVO, Long> {
+public class PhysicalNetworkIsolationMethodDaoImpl extends GenericDaoBase<PhysicalNetworkIsolationMethodVO, Long> implements
+ GenericDao<PhysicalNetworkIsolationMethodVO, Long> {
private final GenericSearchBuilder<PhysicalNetworkIsolationMethodVO, String> IsolationMethodSearch;
private final SearchBuilder<PhysicalNetworkIsolationMethodVO> AllFieldsSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java
index 1e8cc60..65d776e 100644
--- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java
+++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.network.dao;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
/**
*
*/
@@ -54,6 +54,7 @@ public class PhysicalNetworkIsolationMethodVO implements InternalIdentity {
this.isolationMethod = isolationMethod;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java
index 90b0cc4..415b513 100644
--- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java
+++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java
@@ -30,10 +30,11 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
import com.cloud.network.Network.Service;
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.utils.db.GenericDao;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = "physical_network_service_providers")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java
index f39c690..df9030a 100644
--- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java
+++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.network.dao;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
/**
*
*/
@@ -54,6 +54,7 @@ public class PhysicalNetworkTagVO implements InternalIdentity {
this.tag = tag;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java
index 9541d0f..395a4e3 100644
--- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java
+++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java
@@ -29,7 +29,6 @@ import javax.persistence.Table;
import com.cloud.network.Networks.TrafficType;
import com.cloud.network.PhysicalNetworkTrafficType;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = "physical_network_traffic_types")
@@ -70,8 +69,8 @@ public class PhysicalNetworkTrafficTypeVO implements PhysicalNetworkTrafficType
public PhysicalNetworkTrafficTypeVO() {
}
- public PhysicalNetworkTrafficTypeVO(long physicalNetworkId, TrafficType trafficType, String xenLabel, String kvmLabel, String vmwareLabel, String simulatorLabel, String vlan,
- String hypervLabel) {
+ public PhysicalNetworkTrafficTypeVO(long physicalNetworkId, TrafficType trafficType, String xenLabel, String kvmLabel, String vmwareLabel, String simulatorLabel,
+ String vlan, String hypervLabel) {
this.physicalNetworkId = physicalNetworkId;
this.trafficType = trafficType;
this.xenNetworkLabel = xenLabel;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/PortProfileDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PortProfileDao.java b/engine/schema/src/com/cloud/network/dao/PortProfileDao.java
index 43a9bd4..837c9b4 100644
--- a/engine/schema/src/com/cloud/network/dao/PortProfileDao.java
+++ b/engine/schema/src/com/cloud/network/dao/PortProfileDao.java
@@ -17,6 +17,7 @@
package com.cloud.network.dao;
import java.util.List;
+
import com.cloud.utils.db.GenericDao;
public interface PortProfileDao extends GenericDao<PortProfileVO, Long> {
[05/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index b3cf81e..187c701 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -282,7 +282,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
Map<VirtualMachine.Type, VirtualMachineGuru> _vmGurus = new HashMap<VirtualMachine.Type, VirtualMachineGuru>();
protected StateMachine2<State, VirtualMachine.Event, VirtualMachine> _stateMachine;
- static final ConfigKey<Integer> StartRetry = new ConfigKey<Integer>("Advanced", Integer.class, "start.retry", "10", "Number of times to retry create and start commands", true);
+ static final ConfigKey<Integer> StartRetry = new ConfigKey<Integer>("Advanced", Integer.class, "start.retry", "10",
+ "Number of times to retry create and start commands", true);
static final ConfigKey<Integer> VmOpWaitInterval = new ConfigKey<Integer>("Advanced", Integer.class, "vm.op.wait.interval", "120",
"Time (in seconds) to wait before checking if a previous operation has succeeded", true);
@@ -296,8 +297,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
"Time (in seconds) to wait before cancelling a operation", false);
static final ConfigKey<Boolean> VmDestroyForcestop = new ConfigKey<Boolean>("Advanced", Boolean.class, "vm.destroy.forcestop", "false",
"On destroy, force-stop takes this value ", true);
- static final ConfigKey<Integer> ClusterDeltaSyncInterval = new ConfigKey<Integer>("Advanced", Integer.class, "sync.interval", "60", "Cluster Delta sync interval in seconds",
- false);
+ static final ConfigKey<Integer> ClusterDeltaSyncInterval = new ConfigKey<Integer>("Advanced", Integer.class, "sync.interval", "60",
+ "Cluster Delta sync interval in seconds", false);
ScheduledExecutorService _executor = null;
@@ -312,9 +313,10 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
@Override
@DB
- public void allocate(String vmInstanceName, final VirtualMachineTemplate template, ServiceOffering serviceOffering, final Pair<? extends DiskOffering, Long> rootDiskOffering,
- LinkedHashMap<? extends DiskOffering, Long> dataDiskOfferings, final LinkedHashMap<? extends Network, ? extends NicProfile> auxiliaryNetworks, DeploymentPlan plan,
- HypervisorType hyperType) throws InsufficientCapacityException {
+ public void allocate(String vmInstanceName, final VirtualMachineTemplate template, ServiceOffering serviceOffering,
+ final Pair<? extends DiskOffering, Long> rootDiskOffering, LinkedHashMap<? extends DiskOffering, Long> dataDiskOfferings,
+ final LinkedHashMap<? extends Network, ? extends NicProfile> auxiliaryNetworks, DeploymentPlan plan, HypervisorType hyperType)
+ throws InsufficientCapacityException {
VMInstanceVO vm = _vmDao.findVMByInstanceName(vmInstanceName);
final Account owner = _entityMgr.findById(Account.class, vm.getAccountId());
@@ -329,7 +331,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
}
assert (plan.getClusterId() == null && plan.getPoolId() == null) : "We currently don't support cluster and pool preset yet";
final VMInstanceVO vmFinal = _vmDao.persist(vm);
- final LinkedHashMap<? extends DiskOffering, Long> dataDiskOfferingsFinal = dataDiskOfferings == null ? new LinkedHashMap<DiskOffering, Long>() : dataDiskOfferings;
+ final LinkedHashMap<? extends DiskOffering, Long> dataDiskOfferingsFinal =
+ dataDiskOfferings == null ? new LinkedHashMap<DiskOffering, Long>() : dataDiskOfferings;
final VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vmFinal, template, serviceOffering, null, null);
@@ -370,8 +373,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
}
@Override
- public void allocate(String vmInstanceName, VirtualMachineTemplate template, ServiceOffering serviceOffering, LinkedHashMap<? extends Network, ? extends NicProfile> networks,
- DeploymentPlan plan, HypervisorType hyperType) throws InsufficientCapacityException {
+ public void allocate(String vmInstanceName, VirtualMachineTemplate template, ServiceOffering serviceOffering,
+ LinkedHashMap<? extends Network, ? extends NicProfile> networks, DeploymentPlan plan, HypervisorType hyperType) throws InsufficientCapacityException {
allocate(vmInstanceName, template, serviceOffering, new Pair<DiskOffering, Long>(serviceOffering, null), null, networks, plan, hyperType);
}
@@ -550,8 +553,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
}
@DB
- protected Ternary<VMInstanceVO, ReservationContext, ItWorkVO> changeToStartState(VirtualMachineGuru vmGuru, final VMInstanceVO vm, final User caller, final Account account)
- throws ConcurrentOperationException {
+ protected Ternary<VMInstanceVO, ReservationContext, ItWorkVO> changeToStartState(VirtualMachineGuru vmGuru, final VMInstanceVO vm, final User caller,
+ final Account account) throws ConcurrentOperationException {
long vmId = vm.getId();
ItWorkVO work = new ItWorkVO(UUID.randomUUID().toString(), _nodeId, State.Starting, vm.getType(), vm.getId());
@@ -559,23 +562,24 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
while (retry-- != 0) {
try {
final ItWorkVO workFinal = work;
- Ternary<VMInstanceVO, ReservationContext, ItWorkVO> result = Transaction.execute(new TransactionCallbackWithException<Ternary<VMInstanceVO, ReservationContext, ItWorkVO>, NoTransitionException>() {
- @Override
- public Ternary<VMInstanceVO, ReservationContext, ItWorkVO> doInTransaction(TransactionStatus status) throws NoTransitionException {
- Journal journal = new Journal.LogJournal("Creating " + vm, s_logger);
- ItWorkVO work = _workDao.persist(workFinal);
- ReservationContextImpl context = new ReservationContextImpl(work.getId(), journal, caller, account);
-
- if (stateTransitTo(vm, Event.StartRequested, null, work.getId())) {
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Successfully transitioned to start state for " + vm + " reservation id = " + work.getId());
+ Ternary<VMInstanceVO, ReservationContext, ItWorkVO> result =
+ Transaction.execute(new TransactionCallbackWithException<Ternary<VMInstanceVO, ReservationContext, ItWorkVO>, NoTransitionException>() {
+ @Override
+ public Ternary<VMInstanceVO, ReservationContext, ItWorkVO> doInTransaction(TransactionStatus status) throws NoTransitionException {
+ Journal journal = new Journal.LogJournal("Creating " + vm, s_logger);
+ ItWorkVO work = _workDao.persist(workFinal);
+ ReservationContextImpl context = new ReservationContextImpl(work.getId(), journal, caller, account);
+
+ if (stateTransitTo(vm, Event.StartRequested, null, work.getId())) {
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Successfully transitioned to start state for " + vm + " reservation id = " + work.getId());
+ }
+ return new Ternary<VMInstanceVO, ReservationContext, ItWorkVO>(vm, context, work);
}
- return new Ternary<VMInstanceVO, ReservationContext, ItWorkVO>(vm, context, work);
- }
- return new Ternary<VMInstanceVO, ReservationContext, ItWorkVO>(null, null, work);
- }
- });
+ return new Ternary<VMInstanceVO, ReservationContext, ItWorkVO>(null, null, work);
+ }
+ });
work = result.third();
if (result.first() != null)
@@ -681,11 +685,12 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
DataCenterDeployment plan = new DataCenterDeployment(vm.getDataCenterId(), vm.getPodIdToDeployIn(), null, null, null, null, ctx);
if (planToDeploy != null && planToDeploy.getDataCenterId() != 0) {
if (s_logger.isDebugEnabled()) {
- s_logger.debug("advanceStart: DeploymentPlan is provided, using dcId:" + planToDeploy.getDataCenterId() + ", podId: " + planToDeploy.getPodId() + ", clusterId: " +
- planToDeploy.getClusterId() + ", hostId: " + planToDeploy.getHostId() + ", poolId: " + planToDeploy.getPoolId());
+ s_logger.debug("advanceStart: DeploymentPlan is provided, using dcId:" + planToDeploy.getDataCenterId() + ", podId: " + planToDeploy.getPodId() +
+ ", clusterId: " + planToDeploy.getClusterId() + ", hostId: " + planToDeploy.getHostId() + ", poolId: " + planToDeploy.getPoolId());
}
- plan = new DataCenterDeployment(planToDeploy.getDataCenterId(), planToDeploy.getPodId(), planToDeploy.getClusterId(), planToDeploy.getHostId(),
- planToDeploy.getPoolId(), planToDeploy.getPhysicalNetworkId(), ctx);
+ plan =
+ new DataCenterDeployment(planToDeploy.getDataCenterId(), planToDeploy.getPodId(), planToDeploy.getClusterId(), planToDeploy.getHostId(),
+ planToDeploy.getPoolId(), planToDeploy.getPhysicalNetworkId(), ctx);
}
HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vm.getHypervisorType());
@@ -743,20 +748,21 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
// planner
if (s_logger.isDebugEnabled()) {
s_logger.debug("Cannot satisfy the deployment plan passed in since the ready Root volume is in different cluster. volume's cluster: " +
- rootVolClusterId + ", cluster specified: " + clusterIdSpecified);
+ rootVolClusterId + ", cluster specified: " + clusterIdSpecified);
}
throw new ResourceUnavailableException(
- "Root volume is ready in different cluster, Deployment plan provided cannot be satisfied, unable to create a deployment for " + vm,
- Cluster.class, clusterIdSpecified);
+ "Root volume is ready in different cluster, Deployment plan provided cannot be satisfied, unable to create a deployment for " +
+ vm, Cluster.class, clusterIdSpecified);
}
}
- plan = new DataCenterDeployment(planToDeploy.getDataCenterId(), planToDeploy.getPodId(), planToDeploy.getClusterId(), planToDeploy.getHostId(),
- vol.getPoolId(), null, ctx);
+ plan =
+ new DataCenterDeployment(planToDeploy.getDataCenterId(), planToDeploy.getPodId(), planToDeploy.getClusterId(),
+ planToDeploy.getHostId(), vol.getPoolId(), null, ctx);
} else {
plan = new DataCenterDeployment(rootVolDcId, rootVolPodId, rootVolClusterId, null, vol.getPoolId(), null, ctx);
if (s_logger.isDebugEnabled()) {
s_logger.debug(vol + " is READY, changing deployment plan to use this pool's dcId: " + rootVolDcId + " , podId: " + rootVolPodId +
- " , and clusterId: " + rootVolClusterId);
+ " , and clusterId: " + rootVolClusterId);
}
planChangedByVolume = true;
}
@@ -1146,7 +1152,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
advanceStop(vm, cleanUpEvenIfUnableToStop);
}
- private void advanceStop(VMInstanceVO vm, boolean cleanUpEvenIfUnableToStop) throws AgentUnavailableException, OperationTimedoutException, ConcurrentOperationException {
+ private void advanceStop(VMInstanceVO vm, boolean cleanUpEvenIfUnableToStop) throws AgentUnavailableException, OperationTimedoutException,
+ ConcurrentOperationException {
State state = vm.getState();
if (state == State.Stopped) {
if (s_logger.isDebugEnabled()) {
@@ -1606,9 +1613,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
s_logger.info("Migration was unsuccessful. Cleaning up: " + vm);
_networkMgr.rollbackNicForMigration(vmSrc, profile);
- _alertMgr.sendAlert(alertType, fromHost.getDataCenterId(), fromHost.getPodId(), "Unable to migrate vm " + vm.getInstanceName() + " from host " +
- fromHost.getName() + " in zone " + dest.getDataCenter().getName() + " and pod " +
- dest.getPod().getName(), "Migrate Command failed. Please check logs.");
+ _alertMgr.sendAlert(alertType, fromHost.getDataCenterId(), fromHost.getPodId(),
+ "Unable to migrate vm " + vm.getInstanceName() + " from host " + fromHost.getName() + " in zone " + dest.getDataCenter().getName() + " and pod " +
+ dest.getPod().getName(), "Migrate Command failed. Please check logs.");
try {
_agentMgr.send(dstHostId, new Commands(cleanup(vm)), null);
} catch (AgentUnavailableException ae) {
@@ -1641,8 +1648,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
if (_poolHostDao.findByPoolHost(pool.getId(), host.getId()) == null || pool.isLocal() != diskOffering.getUseLocalStorage()) {
// Cannot find a pool for the volume. Throw an exception.
throw new CloudRuntimeException("Cannot migrate volume " + volume + " to storage pool " + pool + " while migrating vm to host " + host +
- ". Either the pool is not accessible from the " +
- "host or because of the offering with which the volume is created it cannot be placed on " + "the given pool.");
+ ". Either the pool is not accessible from the " + "host or because of the offering with which the volume is created it cannot be placed on " +
+ "the given pool.");
} else if (pool.getId() == currentPool.getId()) {
// If the pool to migrate too is the same as current pool, remove the volume from the list of
// volumes to be migrated.
@@ -1674,7 +1681,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
if (!currentPoolAvailable && !volumeToPool.containsKey(volume)) {
// Cannot find a pool for the volume. Throw an exception.
throw new CloudRuntimeException("Cannot find a storage pool which is available for volume " + volume + " while migrating virtual machine " +
- profile.getVirtualMachine() + " to host " + host);
+ profile.getVirtualMachine() + " to host " + host);
}
}
}
@@ -1730,7 +1737,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
// a vm and not migrating a vm with storage.
if (volumeToPool.isEmpty()) {
throw new InvalidParameterValueException("Migration of the vm " + vm + "from host " + srcHost + " to destination host " + destHost +
- " doesn't involve migrating the volumes.");
+ " doesn't involve migrating the volumes.");
}
short alertType = AlertManager.ALERT_TYPE_USERVM_MIGRATE;
@@ -1782,8 +1789,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
} finally {
if (!migrated) {
s_logger.info("Migration was unsuccessful. Cleaning up: " + vm);
- _alertMgr.sendAlert(alertType, srcHost.getDataCenterId(), srcHost.getPodId(), "Unable to migrate vm " + vm.getInstanceName() + " from host " + srcHost.getName() +
- " in zone " + dc.getName() + " and pod " + dc.getName(),
+ _alertMgr.sendAlert(alertType, srcHost.getDataCenterId(), srcHost.getPodId(),
+ "Unable to migrate vm " + vm.getInstanceName() + " from host " + srcHost.getName() + " in zone " + dc.getName() + " and pod " + dc.getName(),
"Migrate Command failed. Please check logs.");
try {
_agentMgr.send(destHostId, new Commands(cleanup(vm.getInstanceName())), null);
@@ -2000,8 +2007,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
AgentVmInfo info = infos.remove(vm.getId());
// sync VM Snapshots related transient states
- List<VMSnapshotVO> vmSnapshotsInTrasientStates = _vmSnapshotDao.listByInstanceId(vm.getId(), VMSnapshot.State.Expunging, VMSnapshot.State.Reverting,
- VMSnapshot.State.Creating);
+ List<VMSnapshotVO> vmSnapshotsInTrasientStates =
+ _vmSnapshotDao.listByInstanceId(vm.getId(), VMSnapshot.State.Expunging, VMSnapshot.State.Reverting, VMSnapshot.State.Creating);
if (vmSnapshotsInTrasientStates.size() > 1) {
s_logger.info("Found vm " + vm.getInstanceName() + " with VM snapshots in transient states, needs to sync VM snapshot state");
if (!_vmSnapshotMgr.syncVMSnapshot(vm, hostId)) {
@@ -2123,8 +2130,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
AgentVmInfo info = infos.remove(vm.getId());
// sync VM Snapshots related transient states
- List<VMSnapshotVO> vmSnapshotsInExpungingStates = _vmSnapshotDao.listByInstanceId(vm.getId(), VMSnapshot.State.Expunging, VMSnapshot.State.Creating,
- VMSnapshot.State.Reverting);
+ List<VMSnapshotVO> vmSnapshotsInExpungingStates =
+ _vmSnapshotDao.listByInstanceId(vm.getId(), VMSnapshot.State.Expunging, VMSnapshot.State.Creating, VMSnapshot.State.Reverting);
if (vmSnapshotsInExpungingStates.size() > 0) {
s_logger.info("Found vm " + vm.getInstanceName() + " in state. " + vm.getState() + ", needs to sync VM snapshot state");
Long hostId = null;
@@ -2144,7 +2151,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
if ((info == null && (vm.getState() == State.Running || vm.getState() == State.Starting)) ||
(info != null && (info.state == State.Running && vm.getState() == State.Starting))) {
s_logger.info("Found vm " + vm.getInstanceName() + " in inconsistent state. " + vm.getState() + " on CS while " + (info == null ? "Stopped" : "Running") +
- " on agent");
+ " on agent");
info = new AgentVmInfo(vm.getInstanceName(), vm, State.Stopped);
// Bug 13850- grab outstanding work item if any for this VM state so that we mark it as DONE after we change VM state, else it will remain pending
@@ -2181,7 +2188,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
e.printStackTrace();
}
} else if (info != null &&
- (vm.getState() == State.Stopped || vm.getState() == State.Stopping || vm.isRemoved() || vm.getState() == State.Destroyed || vm.getState() == State.Expunging)) {
+ (vm.getState() == State.Stopped || vm.getState() == State.Stopping || vm.isRemoved() || vm.getState() == State.Destroyed || vm.getState() == State.Expunging)) {
Host host = _hostDao.findByGuid(info.getHostUuid());
if (host != null) {
s_logger.warn("Stopping a VM which is stopped/stopping/destroyed/expunging " + info.name);
@@ -2335,9 +2342,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
HostVO hostVO = _hostDao.findById(vm.getHostId());
String hostDesc = "name: " + hostVO.getName() + " (id:" + hostVO.getId() + "), availability zone: " + dcVO.getName() + ", pod: " + podVO.getName();
- _alertMgr.sendAlert(alertType, vm.getDataCenterId(), vm.getPodIdToDeployIn(), "VM (name: " + vm.getInstanceName() + ", id: " + vm.getId() + ") stopped on host " +
- hostDesc + " due to storage failure",
- "Virtual Machine " + vm.getInstanceName() + " (id: " + vm.getId() + ") running on host [" + vm.getHostId() + "] stopped due to storage failure.");
+ _alertMgr.sendAlert(alertType, vm.getDataCenterId(), vm.getPodIdToDeployIn(), "VM (name: " + vm.getInstanceName() + ", id: " + vm.getId() +
+ ") stopped on host " + hostDesc + " due to storage failure", "Virtual Machine " + vm.getInstanceName() + " (id: " + vm.getId() + ") running on host [" +
+ vm.getHostId() + "] stopped due to storage failure.");
}
// track hypervsion tools version
if (info.hvtoolsversion != null && !info.hvtoolsversion.isEmpty()) {
@@ -2362,7 +2369,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
if (serverState == State.Starting) {
if (vm.getHostId() != null && vm.getHostId() != hostId) {
s_logger.info("CloudStack is starting VM on host " + vm.getHostId() + ", but status report comes from a different host " + hostId +
- ", skip status sync for vm: " + vm.getInstanceName());
+ ", skip status sync for vm: " + vm.getInstanceName());
return null;
}
}
@@ -2387,7 +2394,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
if (serverState == State.Starting) {
if (vm.getHostId() != null && vm.getHostId() != hostId) {
s_logger.info("CloudStack is starting VM on host " + vm.getHostId() + ", but status report comes from a different host " + hostId +
- ", skip status sync for vm: " + vm.getInstanceName());
+ ", skip status sync for vm: " + vm.getInstanceName());
return null;
}
}
@@ -2402,8 +2409,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
//
if (vm.getHostId() == null || hostId != vm.getHostId()) {
if (s_logger.isDebugEnabled()) {
- s_logger.debug("detected host change when VM " + vm + " is at running state, VM could be live-migrated externally from host " + vm.getHostId() +
- " to host " + hostId);
+ s_logger.debug("detected host change when VM " + vm + " is at running state, VM could be live-migrated externally from host " +
+ vm.getHostId() + " to host " + hostId);
}
stateTransitTo(vm, VirtualMachine.Event.AgentReportMigrated, hostId);
@@ -2500,8 +2507,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
return command;
}
- private void ensureVmRunningContext(long hostId, VMInstanceVO vm, Event cause) throws OperationTimedoutException, ResourceUnavailableException, NoTransitionException,
- InsufficientAddressCapacityException {
+ private void ensureVmRunningContext(long hostId, VMInstanceVO vm, Event cause) throws OperationTimedoutException, ResourceUnavailableException,
+ NoTransitionException, InsufficientAddressCapacityException {
VirtualMachineGuru vmGuru = getVmGuru(vm);
s_logger.debug("VM state is starting on full sync so updating it to running");
@@ -2529,8 +2536,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
List<NicVO> nics = _nicsDao.listByVmId(profile.getId());
for (NicVO nic : nics) {
Network network = _networkModel.getNetwork(nic.getNetworkId());
- NicProfile nicProfile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), null, _networkModel.isSecurityGroupSupportedInNetwork(network),
- _networkModel.getNetworkTag(profile.getHypervisorType(), network));
+ NicProfile nicProfile =
+ new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), null, _networkModel.isSecurityGroupSupportedInNetwork(network),
+ _networkModel.getNetworkTag(profile.getHypervisorType(), network));
profile.addNic(nicProfile);
}
@@ -2701,7 +2709,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
}
try {
lock.addRef();
- List<VMInstanceVO> instances = _vmDao.findVMInTransition(new Date(new Date().getTime() - (AgentManager.Wait.value() * 1000)), State.Starting, State.Stopping);
+ List<VMInstanceVO> instances =
+ _vmDao.findVMInTransition(new Date(new Date().getTime() - (AgentManager.Wait.value() * 1000)), State.Starting, State.Stopping);
for (VMInstanceVO instance : instances) {
State state = instance.getState();
if (state == State.Stopping) {
@@ -2768,17 +2777,18 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
if (!(vmInstance.getState().equals(State.Stopped) || vmInstance.getState().equals(State.Running))) {
s_logger.warn("Unable to upgrade virtual machine " + vmInstance.toString() + " in state " + vmInstance.getState());
throw new InvalidParameterValueException("Unable to upgrade virtual machine " + vmInstance.toString() + " " + " in state " + vmInstance.getState() +
- "; make sure the virtual machine is stopped/running");
+ "; make sure the virtual machine is stopped/running");
}
// Check if the service offering being upgraded to is what the VM is already running with
if (vmInstance.getServiceOfferingId() == newServiceOffering.getId()) {
if (s_logger.isInfoEnabled()) {
- s_logger.info("Not upgrading vm " + vmInstance.toString() + " since it already has the requested " + "service offering (" + newServiceOffering.getName() + ")");
+ s_logger.info("Not upgrading vm " + vmInstance.toString() + " since it already has the requested " + "service offering (" + newServiceOffering.getName() +
+ ")");
}
throw new InvalidParameterValueException("Not upgrading vm " + vmInstance.toString() + " since it already " + "has the requested service offering (" +
- newServiceOffering.getName() + ")");
+ newServiceOffering.getName() + ")");
}
ServiceOfferingVO currentServiceOffering = _offeringDao.findByIdIncludingRemoved(vmInstance.getId(), vmInstance.getServiceOfferingId());
@@ -2796,8 +2806,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
// offering
if (currentServiceOffering.getUseLocalStorage() != newServiceOffering.getUseLocalStorage()) {
throw new InvalidParameterValueException("Unable to upgrade virtual machine " + vmInstance.toString() +
- ", cannot switch between local storage and shared storage service offerings. Current offering " + "useLocalStorage=" +
- currentServiceOffering.getUseLocalStorage() + ", target offering useLocalStorage=" + newServiceOffering.getUseLocalStorage());
+ ", cannot switch between local storage and shared storage service offerings. Current offering " + "useLocalStorage=" +
+ currentServiceOffering.getUseLocalStorage() + ", target offering useLocalStorage=" + newServiceOffering.getUseLocalStorage());
}
// if vm is a system vm, check if it is a system service offering, if yes return with error as it cannot be used for user vms
@@ -2807,8 +2817,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
// Check that there are enough resources to upgrade the service offering
if (!isVirtualMachineUpgradable(vmInstance, newServiceOffering)) {
- throw new InvalidParameterValueException("Unable to upgrade virtual machine, not enough resources available " + "for an offering of " + newServiceOffering.getCpu() +
- " cpu(s) at " + newServiceOffering.getSpeed() + " Mhz, and " + newServiceOffering.getRamSize() + " MB of memory");
+ throw new InvalidParameterValueException("Unable to upgrade virtual machine, not enough resources available " + "for an offering of " +
+ newServiceOffering.getCpu() + " cpu(s) at " + newServiceOffering.getSpeed() + " Mhz, and " + newServiceOffering.getRamSize() + " MB of memory");
}
// Check that the service offering being upgraded to has all the tags of the current service offering
@@ -2816,8 +2826,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
List<String> newTags = StringUtils.csvTagsToList(newServiceOffering.getTags());
if (!newTags.containsAll(currentTags)) {
throw new InvalidParameterValueException("Unable to upgrade virtual machine; the new service offering " + "does not have all the tags of the " +
- "current service offering. Current service offering tags: " + currentTags + "; " + "new service " + "offering tags: " +
- newTags);
+ "current service offering. Current service offering tags: " + currentTags + "; " + "new service " + "offering tags: " + newTags);
}
}
@@ -2922,11 +2931,13 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
// if specified nic is associated with PF/LB/Static NAT
if (rulesMgr.listAssociatedRulesForGuestNic(nic).size() > 0) {
- throw new CloudRuntimeException("Failed to remove nic from " + vm + " in " + network + ", nic has associated Port forwarding or Load balancer or Static NAT rules.");
+ throw new CloudRuntimeException("Failed to remove nic from " + vm + " in " + network +
+ ", nic has associated Port forwarding or Load balancer or Static NAT rules.");
}
- NicProfile nicProfile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), _networkModel.getNetworkRate(network.getId(), vm.getId()),
- _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vmProfile.getVirtualMachine().getHypervisorType(), network));
+ NicProfile nicProfile =
+ new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), _networkModel.getNetworkRate(network.getId(), vm.getId()),
+ _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vmProfile.getVirtualMachine().getHypervisorType(), network));
//1) Unplug the nic
if (vm.getState() == State.Running) {
@@ -2936,8 +2947,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
if (result) {
s_logger.debug("Nic is unplugged successfully for vm " + vm + " in network " + network);
long isDefault = (nic.isDefaultNic()) ? 1 : 0;
- UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_REMOVE, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), Long.toString(nic.getId()),
- network.getNetworkOfferingId(), null, isDefault, VirtualMachine.class.getName(), vm.getUuid());
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_REMOVE, vm.getAccountId(), vm.getDataCenterId(), vm.getId(),
+ Long.toString(nic.getId()), network.getNetworkOfferingId(), null, isDefault, VirtualMachine.class.getName(), vm.getUuid());
} else {
s_logger.warn("Failed to unplug nic for the vm " + vm + " from network " + network);
return false;
@@ -3008,8 +3019,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
}
try {
- NicProfile nicProfile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), _networkModel.getNetworkRate(network.getId(), vm.getId()),
- _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vmProfile.getVirtualMachine().getHypervisorType(), network));
+ NicProfile nicProfile =
+ new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), _networkModel.getNetworkRate(network.getId(), vm.getId()),
+ _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vmProfile.getVirtualMachine().getHypervisorType(), network));
//1) Unplug the nic
if (vm.getState() == State.Running) {
@@ -3097,7 +3109,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
}
@Override
- public void migrateForScale(String vmUuid, long srcHostId, DeployDestination dest, Long oldSvcOfferingId) throws ResourceUnavailableException, ConcurrentOperationException {
+ public void migrateForScale(String vmUuid, long srcHostId, DeployDestination dest, Long oldSvcOfferingId) throws ResourceUnavailableException,
+ ConcurrentOperationException {
VMInstanceVO vm = _vmDao.findByUuid(vmUuid);
s_logger.info("Migrating " + vm + " to " + dest);
@@ -3230,9 +3243,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
if (!migrated) {
s_logger.info("Migration was unsuccessful. Cleaning up: " + vm);
- _alertMgr.sendAlert(alertType, fromHost.getDataCenterId(), fromHost.getPodId(), "Unable to migrate vm " + vm.getInstanceName() + " from host " +
- fromHost.getName() + " in zone " + dest.getDataCenter().getName() + " and pod " +
- dest.getPod().getName(), "Migrate Command failed. Please check logs.");
+ _alertMgr.sendAlert(alertType, fromHost.getDataCenterId(), fromHost.getPodId(),
+ "Unable to migrate vm " + vm.getInstanceName() + " from host " + fromHost.getName() + " in zone " + dest.getDataCenter().getName() + " and pod " +
+ dest.getPod().getName(), "Migrate Command failed. Please check logs.");
try {
_agentMgr.send(dstHostId, new Commands(cleanup(vm.getInstanceName())), null);
} catch (AgentUnavailableException ae) {
@@ -3326,8 +3339,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
Float memoryOvercommitRatio = CapacityManager.MemOverprovisioningFactor.valueIn(hostVo.getClusterId());
Float cpuOvercommitRatio = CapacityManager.CpuOverprovisioningFactor.valueIn(hostVo.getClusterId());
long minMemory = (long)(newServiceOffering.getRamSize() / memoryOvercommitRatio);
- ScaleVmCommand reconfigureCmd = new ScaleVmCommand(vm.getInstanceName(), newServiceOffering.getCpu(), (int)(newServiceOffering.getSpeed() / cpuOvercommitRatio),
- newServiceOffering.getSpeed(), minMemory * 1024L * 1024L, newServiceOffering.getRamSize() * 1024L * 1024L, newServiceOffering.getLimitCpuUse());
+ ScaleVmCommand reconfigureCmd =
+ new ScaleVmCommand(vm.getInstanceName(), newServiceOffering.getCpu(), (int)(newServiceOffering.getSpeed() / cpuOvercommitRatio),
+ newServiceOffering.getSpeed(), minMemory * 1024L * 1024L, newServiceOffering.getRamSize() * 1024L * 1024L, newServiceOffering.getLimitCpuUse());
Long dstHostId = vm.getHostId();
ItWorkVO work = new ItWorkVO(UUID.randomUUID().toString(), _nodeId, State.Running, vm.getType(), vm.getId());
@@ -3376,8 +3390,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
@Override
public ConfigKey<?>[] getConfigKeys() {
- return new ConfigKey<?>[] {ClusterDeltaSyncInterval, StartRetry, VmDestroyForcestop, VmOpCancelInterval, VmOpCleanupInterval, VmOpCleanupWait, VmOpLockStateRetry,
- VmOpWaitInterval, ExecuteInSequence};
+ return new ConfigKey<?>[] {ClusterDeltaSyncInterval, StartRetry, VmDestroyForcestop, VmOpCancelInterval, VmOpCleanupInterval, VmOpCleanupWait,
+ VmOpLockStateRetry, VmOpWaitInterval, ExecuteInSequence};
}
public List<StoragePoolAllocator> getStoragePoolAllocators() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java
index 4c47b6c..7c53302 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.engine.cloud.entity.api;
+import java.util.Map;
+
import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO;
import com.cloud.deploy.DeploymentPlan;
@@ -27,8 +29,6 @@ import com.cloud.exception.OperationTimedoutException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.vm.VirtualMachineProfile;
-import java.util.Map;
-
public interface VMEntityManager {
VMEntityVO loadVirtualMachine(String vmId);
@@ -38,8 +38,8 @@ public interface VMEntityManager {
String reserveVirtualMachine(VMEntityVO vmEntityVO, String plannerToUse, DeploymentPlan plan, ExcludeList exclude) throws InsufficientCapacityException,
ResourceUnavailableException;
- void deployVirtualMachine(String reservationId, VMEntityVO vmEntityVO, String caller, Map<VirtualMachineProfile.Param, Object> params) throws InsufficientCapacityException,
- ResourceUnavailableException;
+ void deployVirtualMachine(String reservationId, VMEntityVO vmEntityVO, String caller, Map<VirtualMachineProfile.Param, Object> params)
+ throws InsufficientCapacityException, ResourceUnavailableException;
boolean stopvirtualmachine(VMEntityVO vmEntityVO, String caller) throws ResourceUnavailableException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
index d9c0d2d..c02e0ad 100755
--- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
@@ -138,8 +138,8 @@ public class VMEntityManagerImpl implements VMEntityManager {
}
@Override
- public String reserveVirtualMachine(VMEntityVO vmEntityVO, String plannerToUse, DeploymentPlan planToDeploy, ExcludeList exclude) throws InsufficientCapacityException,
- ResourceUnavailableException {
+ public String reserveVirtualMachine(VMEntityVO vmEntityVO, String plannerToUse, DeploymentPlan planToDeploy, ExcludeList exclude)
+ throws InsufficientCapacityException, ResourceUnavailableException {
//call planner and get the deployDestination.
//load vm instance and offerings and call virtualMachineManagerImpl
@@ -148,8 +148,9 @@ public class VMEntityManagerImpl implements VMEntityManager {
VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vm);
DataCenterDeployment plan = new DataCenterDeployment(vm.getDataCenterId(), vm.getPodIdToDeployIn(), null, null, null, null);
if (planToDeploy != null && planToDeploy.getDataCenterId() != 0) {
- plan = new DataCenterDeployment(planToDeploy.getDataCenterId(), planToDeploy.getPodId(), planToDeploy.getClusterId(), planToDeploy.getHostId(),
- planToDeploy.getPoolId(), planToDeploy.getPhysicalNetworkId());
+ plan =
+ new DataCenterDeployment(planToDeploy.getDataCenterId(), planToDeploy.getPodId(), planToDeploy.getClusterId(), planToDeploy.getHostId(),
+ planToDeploy.getPoolId(), planToDeploy.getPhysicalNetworkId());
}
boolean planChangedByReadyVolume = false;
@@ -169,12 +170,13 @@ public class VMEntityManagerImpl implements VMEntityManager {
// cannot satisfy the plan passed in to the
// planner
throw new ResourceUnavailableException(
- "Root volume is ready in different cluster, Deployment plan provided cannot be satisfied, unable to create a deployment for " + vm, Cluster.class,
- clusterIdSpecified);
+ "Root volume is ready in different cluster, Deployment plan provided cannot be satisfied, unable to create a deployment for " + vm,
+ Cluster.class, clusterIdSpecified);
}
}
- plan = new DataCenterDeployment(planToDeploy.getDataCenterId(), planToDeploy.getPodId(), planToDeploy.getClusterId(), planToDeploy.getHostId(),
- vol.getPoolId(), null, null);
+ plan =
+ new DataCenterDeployment(planToDeploy.getDataCenterId(), planToDeploy.getPodId(), planToDeploy.getClusterId(), planToDeploy.getHostId(),
+ vol.getPoolId(), null, null);
} else {
plan = new DataCenterDeployment(rootVolDcId, rootVolPodId, rootVolClusterId, null, vol.getPoolId(), null, null);
planChangedByReadyVolume = true;
@@ -223,8 +225,8 @@ public class VMEntityManagerImpl implements VMEntityManager {
VMReservationVO vmReservation = _reservationDao.findByReservationId(reservationId);
if (vmReservation != null) {
- DataCenterDeployment reservedPlan = new DataCenterDeployment(vm.getDataCenterId(), vmReservation.getPodId(), vmReservation.getClusterId(), vmReservation.getHostId(),
- null, null);
+ DataCenterDeployment reservedPlan =
+ new DataCenterDeployment(vm.getDataCenterId(), vmReservation.getPodId(), vmReservation.getClusterId(), vmReservation.getHostId(), null, null);
try {
_itMgr.start(vm.getUuid(), params, reservedPlan);
} catch (Exception ex) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
index 3d596d2..ed8909c 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
@@ -23,9 +23,10 @@ import java.util.Map;
import javax.inject.Inject;
-import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO;
import org.springframework.stereotype.Component;
+import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO;
+
import com.cloud.deploy.DeploymentPlan;
import com.cloud.deploy.DeploymentPlanner.ExcludeList;
import com.cloud.exception.AgentUnavailableException;
@@ -50,8 +51,8 @@ public class VirtualMachineEntityImpl implements VirtualMachineEntity {
this.vmEntityVO = this.manager.loadVirtualMachine(vmId);
}
- public void init(String vmId, String owner, String hostName, String displayName, int cpu, int speed, long memory, List<String> computeTags, List<String> rootDiskTags,
- List<String> networks) {
+ public void init(String vmId, String owner, String hostName, String displayName, int cpu, int speed, long memory, List<String> computeTags,
+ List<String> rootDiskTags, List<String> networks) {
init(vmId);
this.vmEntityVO.setOwner(owner);
this.vmEntityVO.setHostname(hostName);
@@ -196,7 +197,8 @@ public class VirtualMachineEntityImpl implements VirtualMachineEntity {
}
@Override
- public String reserve(String plannerToUse, DeploymentPlan plan, ExcludeList exclude, String caller) throws InsufficientCapacityException, ResourceUnavailableException {
+ public String reserve(String plannerToUse, DeploymentPlan plan, ExcludeList exclude, String caller) throws InsufficientCapacityException,
+ ResourceUnavailableException {
return manager.reserveVirtualMachine(this.vmEntityVO, plannerToUse, plan, exclude);
}
@@ -207,7 +209,8 @@ public class VirtualMachineEntityImpl implements VirtualMachineEntity {
}
@Override
- public void deploy(String reservationId, String caller, Map<VirtualMachineProfile.Param, Object> params) throws InsufficientCapacityException, ResourceUnavailableException {
+ public void deploy(String reservationId, String caller, Map<VirtualMachineProfile.Param, Object> params) throws InsufficientCapacityException,
+ ResourceUnavailableException {
manager.deployVirtualMachine(reservationId, this.vmEntityVO, caller, params);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java
index 006a366..a5416c0 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO;
+
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.org.Cluster.ClusterType;
import com.cloud.org.Grouping.AllocationState;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java
index 5bd2193..41366f7 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.engine.datacenter.entity.api;
import javax.inject.Inject;
+import org.springframework.stereotype.Component;
+
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO;
@@ -28,7 +30,6 @@ import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineClusterDa
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineDataCenterDao;
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostDao;
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostPodDao;
-import org.springframework.stereotype.Component;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.utils.fsm.NoTransitionException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java
index bccadcb..ee434bb 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java
@@ -23,10 +23,13 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
+
import javax.ws.rs.GET;
import javax.ws.rs.Path;
+
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO;
+
import com.cloud.utils.fsm.FiniteStateObject;
import com.cloud.utils.fsm.NoTransitionException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java
index 723ce3a..82b6150 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java
@@ -208,8 +208,8 @@ public class EngineDataCenterVO implements EngineDataCenter, Identity {
this.firewallProvider = firewallProvider;
}
- public EngineDataCenterVO(long id, String name, String description, String dns1, String dns2, String dns3, String dns4, String guestCidr, String domain, Long domainId,
- NetworkType zoneType, String zoneToken, String domainSuffix) {
+ public EngineDataCenterVO(long id, String name, String description, String dns1, String dns2, String dns3, String dns4, String guestCidr, String domain,
+ Long domainId, NetworkType zoneType, String zoneToken, String domainSuffix) {
this(name, description, dns1, dns2, dns3, dns4, guestCidr, domain, domainId, zoneType, zoneToken, domainSuffix, false, false, null, null);
this.id = id;
this.allocationState = Grouping.AllocationState.Enabled;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java
index 910dea4..b064a35 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java
@@ -403,10 +403,10 @@ public class EngineHostVO implements EngineHost, Identity {
this.orchestrationState = State.Disabled;
}
- public EngineHostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress, String publicNetmask,
- String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String deuxStorageIpAddress, String duxStorageNetmask,
- String deuxStorageMacAddress, String guid, Status status, String version, String iqn, Date disconnectedOn, long dcId, Long podId, long serverId, long ping,
- String parent, long totalSize, StoragePoolType fsType) {
+ public EngineHostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress,
+ String publicNetmask, String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String deuxStorageIpAddress,
+ String duxStorageNetmask, String deuxStorageMacAddress, String guid, Status status, String version, String iqn, Date disconnectedOn, long dcId, Long podId,
+ long serverId, long ping, String parent, long totalSize, StoragePoolType fsType) {
this(id,
name,
type,
@@ -440,9 +440,10 @@ public class EngineHostVO implements EngineHost, Identity {
this.orchestrationState = State.Disabled;
}
- public EngineHostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress, String publicNetmask,
- String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String guid, Status status, String version, String url,
- Date disconnectedOn, long dcId, Long podId, long serverId, long ping, Integer cpus, Long speed, Long totalMemory, long dom0MinMemory, String caps) {
+ public EngineHostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress,
+ String publicNetmask, String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String guid, Status status,
+ String version, String url, Date disconnectedOn, long dcId, Long podId, long serverId, long ping, Integer cpus, Long speed, Long totalMemory,
+ long dom0MinMemory, String caps) {
this.id = id;
this.name = name;
this.status = status;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java
index f821049..b93d8f5 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java
@@ -22,9 +22,10 @@ import java.util.Map;
import javax.ejb.Local;
-import org.apache.cloudstack.engine.datacenter.entity.api.db.DcDetailVO;
import org.springframework.stereotype.Component;
+import org.apache.cloudstack.engine.datacenter.entity.api.db.DcDetailVO;
+
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java
index ee2c576..b21b230 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java
@@ -28,13 +28,14 @@ import java.util.Map;
import javax.ejb.Local;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.org.Grouping;
@@ -230,7 +231,8 @@ public class EngineClusterDaoImpl extends GenericDaoBase<EngineClusterVO, Long>
GenericSearchBuilder<EngineClusterVO, Long> clusterIdSearch = createSearchBuilder(Long.class);
clusterIdSearch.selectFields(clusterIdSearch.entity().getId());
- clusterIdSearch.join("disabledPodIdSearch", disabledPodIdSearch, clusterIdSearch.entity().getPodId(), disabledPodIdSearch.entity().getId(), JoinBuilder.JoinType.INNER);
+ clusterIdSearch.join("disabledPodIdSearch", disabledPodIdSearch, clusterIdSearch.entity().getPodId(), disabledPodIdSearch.entity().getId(),
+ JoinBuilder.JoinType.INNER);
clusterIdSearch.done();
SearchCriteria<Long> sc = clusterIdSearch.create();
@@ -276,7 +278,12 @@ public class EngineClusterDaoImpl extends GenericDaoBase<EngineClusterVO, Long>
EngineClusterVO dbCluster = findByIdIncludingRemoved(vo.getId());
if (dbCluster != null) {
StringBuilder str = new StringBuilder("Unable to update ").append(vo.toString());
- str.append(": DB Data={id=").append(dbCluster.getId()).append("; state=").append(dbCluster.getState()).append(";updatedTime=").append(dbCluster.getLastUpdated());
+ str.append(": DB Data={id=")
+ .append(dbCluster.getId())
+ .append("; state=")
+ .append(dbCluster.getState())
+ .append(";updatedTime=")
+ .append(dbCluster.getLastUpdated());
str.append(": New Data={id=")
.append(vo.getId())
.append("; state=")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java
index f7be7d2..4b6818e 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java
@@ -26,12 +26,13 @@ import javax.inject.Inject;
import javax.naming.ConfigurationException;
import javax.persistence.TableGenerator;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
import com.cloud.org.Grouping;
import com.cloud.utils.NumbersUtil;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java
index b6e9015..a332a4c 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java
@@ -24,7 +24,6 @@ import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO;
import com.cloud.host.Host;
import com.cloud.host.Host.Type;
-import com.cloud.host.Status;
import com.cloud.info.RunningHostCountInfo;
import com.cloud.resource.ResourceState;
import com.cloud.utils.db.GenericDao;
@@ -34,7 +33,8 @@ import com.cloud.utils.fsm.StateDao;
* Data Access Object for server
*
*/
-public interface EngineHostDao extends GenericDao<EngineHostVO, Long>, StateDao<DataCenterResourceEntity.State, DataCenterResourceEntity.State.Event, DataCenterResourceEntity> {
+public interface EngineHostDao extends GenericDao<EngineHostVO, Long>,
+ StateDao<DataCenterResourceEntity.State, DataCenterResourceEntity.State.Event, DataCenterResourceEntity> {
long countBy(long clusterId, ResourceState... states);
/**
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
index 7e01374..97ac589 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
@@ -502,7 +502,8 @@ public class EngineHostDaoImpl extends GenericDaoBase<EngineHostVO, Long> implem
List<EngineHostVO> result = new ArrayList<EngineHostVO>();
ResultSet rs = null;
try {
- String sql = "select h.id from host h left join cluster c on h.cluster_id=c.id where h.mgmt_server_id is not null and h.last_ping < ? and h.status in ('Up', 'Updating', 'Disconnected', 'Connecting') and h.type not in ('ExternalFirewall', 'ExternalLoadBalancer', 'TrafficMonitor', 'SecondaryStorage', 'LocalSecondaryStorage', 'L2Networking') and (h.cluster_id is null or c.managed_state = 'Managed') ;";
+ String sql =
+ "select h.id from host h left join cluster c on h.cluster_id=c.id where h.mgmt_server_id is not null and h.last_ping < ? and h.status in ('Up', 'Updating', 'Disconnected', 'Connecting') and h.type not in ('ExternalFirewall', 'ExternalLoadBalancer', 'TrafficMonitor', 'SecondaryStorage', 'LocalSecondaryStorage', 'L2Networking') and (h.cluster_id is null or c.managed_state = 'Managed') ;";
pstmt = txn.prepareStatement(sql);
pstmt.setLong(1, timeout);
rs = pstmt.executeQuery();
@@ -593,10 +594,11 @@ public class EngineHostDaoImpl extends GenericDaoBase<EngineHostVO, Long> implem
@Override
@DB
public List<RunningHostCountInfo> getRunningHostCounts(Date cutTime) {
- String sql = "select * from (" + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid "
- + "where h.status='Up' and h.type='SecondaryStorage' and m.last_update > ? " + "group by h.data_center_id, h.type " + "UNION ALL "
- + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid "
- + "where h.status='Up' and h.type='Routing' and m.last_update > ? " + "group by h.data_center_id, h.type) as t " + "ORDER by t.data_center_id, t.type";
+ String sql =
+ "select * from (" + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid "
+ + "where h.status='Up' and h.type='SecondaryStorage' and m.last_update > ? " + "group by h.data_center_id, h.type " + "UNION ALL "
+ + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid "
+ + "where h.status='Up' and h.type='Routing' and m.last_update > ? " + "group by h.data_center_id, h.type) as t " + "ORDER by t.data_center_id, t.type";
ArrayList<RunningHostCountInfo> l = new ArrayList<RunningHostCountInfo>();
@@ -752,8 +754,8 @@ public class EngineHostDaoImpl extends GenericDaoBase<EngineHostVO, Long> implem
}
@Override
- public List<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> lockRows(SearchCriteria<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> sc,
- Filter filter, boolean exclusive) {
+ public List<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> lockRows(
+ SearchCriteria<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> sc, Filter filter, boolean exclusive) {
// TODO Auto-generated method stub
return null;
}
@@ -766,15 +768,15 @@ public class EngineHostDaoImpl extends GenericDaoBase<EngineHostVO, Long> implem
}
@Override
- public List<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> search(SearchCriteria<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> sc,
- Filter filter) {
+ public List<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> search(
+ SearchCriteria<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> sc, Filter filter) {
// TODO Auto-generated method stub
return null;
}
@Override
- public List<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> search(SearchCriteria<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> sc,
- Filter filter, boolean enable_query_cache) {
+ public List<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> search(
+ SearchCriteria<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> sc, Filter filter, boolean enable_query_cache) {
// TODO Auto-generated method stub
return null;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java
index 72d7dba..46480ef 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java
@@ -26,21 +26,22 @@ import java.util.List;
import javax.ejb.Local;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
import com.cloud.org.Grouping;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.UpdateBuilder;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.TransactionLegacy;
+import com.cloud.utils.db.UpdateBuilder;
@Component(value = "EngineHostPodDao")
@Local(value = {EngineHostPodDao.class})
@@ -162,7 +163,7 @@ public class EngineHostPodDaoImpl extends GenericDaoBase<EngineHostPodVO, Long>
builder.set(vo, "state", nextState);
builder.set(vo, "lastUpdated", new Date());
- int rows = update((EngineHostPodVO)vo, sc);
+ int rows = update(vo, sc);
if (rows == 0 && s_logger.isDebugEnabled()) {
EngineHostPodVO dbDC = findByIdIncludingRemoved(vo.getId());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDao.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDao.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDao.java
index fb142f4..12b8a59 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDao.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDao.java
@@ -17,6 +17,7 @@
package org.apache.cloudstack.engine.datacenter.entity.api.db.dao;
import java.util.List;
+
import com.cloud.host.HostTagVO;
import com.cloud.utils.db.GenericDao;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
index aaa44dd..303f1e0 100755
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
@@ -96,8 +96,8 @@ public class CloudOrchestrator implements OrchestrationService {
public CloudOrchestrator() {
}
- public VirtualMachineEntity createFromScratch(String uuid, String iso, String os, String hypervisor, String hostName, int cpu, int speed, long memory, List<String> networks,
- List<String> computeTags, Map<String, String> details, String owner) {
+ public VirtualMachineEntity createFromScratch(String uuid, String iso, String os, String hypervisor, String hostName, int cpu, int speed, long memory,
+ List<String> networks, List<String> computeTags, Map<String, String> details, String owner) {
return null;
}
@@ -150,9 +150,9 @@ public class CloudOrchestrator implements OrchestrationService {
}
@Override
- public VirtualMachineEntity createVirtualMachine(String id, String owner, String templateId, String hostName, String displayName, String hypervisor, int cpu, int speed,
- long memory, Long diskSize, List<String> computeTags, List<String> rootDiskTags, Map<String, NicProfile> networkNicMap, DeploymentPlan plan, Long rootDiskSize)
- throws InsufficientCapacityException {
+ public VirtualMachineEntity createVirtualMachine(String id, String owner, String templateId, String hostName, String displayName, String hypervisor, int cpu,
+ int speed, long memory, Long diskSize, List<String> computeTags, List<String> rootDiskTags, Map<String, NicProfile> networkNicMap, DeploymentPlan plan,
+ Long rootDiskSize) throws InsufficientCapacityException {
// VirtualMachineEntityImpl vmEntity = new VirtualMachineEntityImpl(id, owner, hostName, displayName, cpu, speed, memory, computeTags, rootDiskTags, networks, vmEntityManager);
@@ -198,14 +198,15 @@ public class CloudOrchestrator implements OrchestrationService {
dataDiskOfferings.put(diskOffering, size);
}
- _itMgr.allocate(vm.getInstanceName(), _templateDao.findById(new Long(templateId)), offering, rootDiskOffering, dataDiskOfferings, networkIpMap, plan, hypervisorType);
+ _itMgr.allocate(vm.getInstanceName(), _templateDao.findById(new Long(templateId)), offering, rootDiskOffering, dataDiskOfferings, networkIpMap, plan,
+ hypervisorType);
return vmEntity;
}
@Override
- public VirtualMachineEntity createVirtualMachineFromScratch(String id, String owner, String isoId, String hostName, String displayName, String hypervisor, String os, int cpu,
- int speed, long memory, Long diskSize, List<String> computeTags, List<String> rootDiskTags, Map<String, NicProfile> networkNicMap, DeploymentPlan plan)
+ public VirtualMachineEntity createVirtualMachineFromScratch(String id, String owner, String isoId, String hostName, String displayName, String hypervisor, String os,
+ int cpu, int speed, long memory, Long diskSize, List<String> computeTags, List<String> rootDiskTags, Map<String, NicProfile> networkNicMap, DeploymentPlan plan)
throws InsufficientCapacityException {
// VirtualMachineEntityImpl vmEntity = new VirtualMachineEntityImpl(id, owner, hostName, displayName, cpu, speed, memory, computeTags, rootDiskTags, networks, vmEntityManager);
[35/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelExportTaskResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelExportTaskResponse.java b/awsapi/src/com/amazon/ec2/CancelExportTaskResponse.java
index c40aa31..3d19c7e 100644
--- a/awsapi/src/com/amazon/ec2/CancelExportTaskResponse.java
+++ b/awsapi/src/com/amazon/ec2/CancelExportTaskResponse.java
@@ -98,7 +98,8 @@ public class CancelExportTaskResponse implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CancelExportTaskResponse implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelExportTaskResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelExportTaskResponseType.java b/awsapi/src/com/amazon/ec2/CancelExportTaskResponseType.java
index 6939bea..f32c4a5 100644
--- a/awsapi/src/com/amazon/ec2/CancelExportTaskResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CancelExportTaskResponseType.java
@@ -125,7 +125,8 @@ public class CancelExportTaskResponseType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class CancelExportTaskResponseType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelExportTaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelExportTaskType.java b/awsapi/src/com/amazon/ec2/CancelExportTaskType.java
index 5dc0853..71d70c0 100644
--- a/awsapi/src/com/amazon/ec2/CancelExportTaskType.java
+++ b/awsapi/src/com/amazon/ec2/CancelExportTaskType.java
@@ -101,7 +101,8 @@ public class CancelExportTaskType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class CancelExportTaskType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListing.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListing.java b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListing.java
index e3ecd93..3fc491b 100644
--- a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListing.java
+++ b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListing.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class CancelReservedInstancesListing implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelReservedInstancesListing", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelReservedInstancesListing",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class CancelReservedInstancesListing implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class CancelReservedInstancesListing implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponse.java b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponse.java
index c2610f4..72c0c55 100644
--- a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponse.java
+++ b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponse.java
@@ -30,8 +30,8 @@ package com.amazon.ec2;
public class CancelReservedInstancesListingResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelReservedInstancesListingResponse",
- "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "CancelReservedInstancesListingResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -99,7 +99,8 @@ public class CancelReservedInstancesListingResponse implements org.apache.axis2.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -119,9 +120,8 @@ public class CancelReservedInstancesListingResponse implements org.apache.axis2.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponseType.java b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponseType.java
index 5e47546..bee242f 100644
--- a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponseType.java
@@ -125,7 +125,8 @@ public class CancelReservedInstancesListingResponseType implements org.apache.ax
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -202,7 +203,8 @@ public class CancelReservedInstancesListingResponseType implements org.apache.ax
if (localReservedInstancesListingsSet == null) {
throw new org.apache.axis2.databinding.ADBException("reservedInstancesListingsSet cannot be null!!");
}
- localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet"), factory, xmlWriter);
+ localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet"), factory,
+ xmlWriter);
xmlWriter.writeEndElement();
@@ -211,9 +213,8 @@ public class CancelReservedInstancesListingResponseType implements org.apache.ax
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -445,7 +446,8 @@ public class CancelReservedInstancesListingResponseType implements org.apache.ax
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet").equals(reader.getName())) {
object.setReservedInstancesListingsSet(com.amazon.ec2.DescribeReservedInstancesListingsResponseSetType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingType.java b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingType.java
index 5d1f44f..f1cd0f3 100644
--- a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingType.java
+++ b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingType.java
@@ -101,7 +101,8 @@ public class CancelReservedInstancesListingType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class CancelReservedInstancesListingType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -391,7 +391,8 @@ public class CancelReservedInstancesListingType implements org.apache.axis2.data
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingId").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingId").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java
index d9d256a..b2a0b7b 100644
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java
+++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class CancelSpotInstanceRequests implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelSpotInstanceRequests", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelSpotInstanceRequests",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class CancelSpotInstanceRequests implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class CancelSpotInstanceRequests implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java
index 4b10065..8dd023a 100644
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java
+++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class CancelSpotInstanceRequestsResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelSpotInstanceRequestsResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "CancelSpotInstanceRequestsResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class CancelSpotInstanceRequestsResponse implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class CancelSpotInstanceRequestsResponse implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java
index 17769ab..63bc699 100644
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java
@@ -125,7 +125,8 @@ public class CancelSpotInstanceRequestsResponseSetItemType implements org.apache
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class CancelSpotInstanceRequestsResponseSetItemType implements org.apache
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -455,7 +455,8 @@ public class CancelSpotInstanceRequestsResponseSetItemType implements org.apache
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java
index 1bb5522..24494dc 100644
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java
+++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java
@@ -90,7 +90,8 @@ public class CancelSpotInstanceRequestsResponseSetType implements org.apache.axi
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem);
list.add(param);
- this.localItem = (com.amazon.ec2.CancelSpotInstanceRequestsResponseSetItemType[])list.toArray(new com.amazon.ec2.CancelSpotInstanceRequestsResponseSetItemType[list.size()]);
+ this.localItem =
+ (com.amazon.ec2.CancelSpotInstanceRequestsResponseSetItemType[])list.toArray(new com.amazon.ec2.CancelSpotInstanceRequestsResponseSetItemType[list.size()]);
}
@@ -129,7 +130,8 @@ public class CancelSpotInstanceRequestsResponseSetType implements org.apache.axi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -195,9 +197,8 @@ public class CancelSpotInstanceRequestsResponseSetType implements org.apache.axi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java
index b16fe58..6f6c3ca 100644
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java
@@ -125,7 +125,8 @@ public class CancelSpotInstanceRequestsResponseType implements org.apache.axis2.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class CancelSpotInstanceRequestsResponseType implements org.apache.axis2.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -445,7 +445,8 @@ public class CancelSpotInstanceRequestsResponseType implements org.apache.axis2.
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestSet").equals(reader.getName())) {
object.setSpotInstanceRequestSet(com.amazon.ec2.CancelSpotInstanceRequestsResponseSetType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java
index 0325a4a..06eaa29 100644
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java
+++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java
@@ -101,7 +101,8 @@ public class CancelSpotInstanceRequestsType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -155,9 +156,8 @@ public class CancelSpotInstanceRequestsType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -363,7 +363,8 @@ public class CancelSpotInstanceRequestsType implements org.apache.axis2.databind
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestIdSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestIdSet").equals(reader.getName())) {
object.setSpotInstanceRequestIdSet(com.amazon.ec2.SpotInstanceRequestIdSetType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java b/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java
index 2f47ee4..3f3ce43 100644
--- a/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java
+++ b/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java
@@ -98,7 +98,8 @@ public class ConfirmProductInstance implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ConfirmProductInstance implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class ConfirmProductInstance implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ConfirmProductInstance").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ConfirmProductInstance").equals(reader.getName())) {
object.setConfirmProductInstance(com.amazon.ec2.ConfirmProductInstanceType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java
index 6537444..7073bcd 100644
--- a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java
+++ b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class ConfirmProductInstanceResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ConfirmProductInstanceResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ConfirmProductInstanceResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class ConfirmProductInstanceResponse implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class ConfirmProductInstanceResponse implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java
index fd741e3..974daad 100644
--- a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java
@@ -163,7 +163,8 @@ public class ConfirmProductInstanceResponseType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -305,9 +306,8 @@ public class ConfirmProductInstanceResponseType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java
index 8736e96..f5bfcf7 100644
--- a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java
+++ b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java
@@ -125,7 +125,8 @@ public class ConfirmProductInstanceType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class ConfirmProductInstanceType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java b/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java
index 7d6db4b..cf263b4 100644
--- a/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java
+++ b/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java
@@ -101,7 +101,8 @@ public class ConversionTaskIdItemType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class ConversionTaskIdItemType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java b/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java
index 0f68c2d..b9e816b 100644
--- a/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java
@@ -142,7 +142,8 @@ public class ConversionTaskIdSetType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class ConversionTaskIdSetType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java b/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java
index b98eed6..21ad4e7 100644
--- a/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java
+++ b/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java
@@ -142,7 +142,8 @@ public class ConversionTaskSetType implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class ConversionTaskSetType implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,8 +463,8 @@ public class ConversionTaskSetType implements org.apache.axis2.databinding.ADBBe
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.ConversionTaskType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.ConversionTaskType.class,
- list1));
+ object.setItem((com.amazon.ec2.ConversionTaskType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+ com.amazon.ec2.ConversionTaskType.class, list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ConversionTaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskType.java b/awsapi/src/com/amazon/ec2/ConversionTaskType.java
index d0b8636..8c5ccce 100644
--- a/awsapi/src/com/amazon/ec2/ConversionTaskType.java
+++ b/awsapi/src/com/amazon/ec2/ConversionTaskType.java
@@ -263,7 +263,8 @@ public class ConversionTaskType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -451,9 +452,8 @@ public class ConversionTaskType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java
index 4a43e7d..6e84c37 100644
--- a/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java
@@ -168,7 +168,8 @@ public class ConversionTaskTypeChoice_type0 implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -207,9 +208,8 @@ public class ConversionTaskTypeChoice_type0 implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java b/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java
index 6557cf8..daf6bc0 100644
--- a/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java
+++ b/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java
@@ -98,7 +98,8 @@ public class CreateCustomerGateway implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateCustomerGateway implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateCustomerGateway implements org.apache.axis2.databinding.ADBBe
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateCustomerGateway").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateCustomerGateway").equals(reader.getName())) {
object.setCreateCustomerGateway(com.amazon.ec2.CreateCustomerGatewayType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java
index a90346a..04bafee 100644
--- a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class CreateCustomerGatewayResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateCustomerGatewayResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateCustomerGatewayResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class CreateCustomerGatewayResponse implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class CreateCustomerGatewayResponse implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java
index 40c3b4b..ed7a135 100644
--- a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java
@@ -125,7 +125,8 @@ public class CreateCustomerGatewayResponseType implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class CreateCustomerGatewayResponseType implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java
index 9e50b15..002fae2 100644
--- a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java
@@ -164,7 +164,8 @@ public class CreateCustomerGatewayType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -306,9 +307,8 @@ public class CreateCustomerGatewayType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java
index a895e4a..d182cb1 100644
--- a/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java
+++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java
@@ -98,7 +98,8 @@ public class CreateDhcpOptions implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateDhcpOptions implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateDhcpOptions implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateDhcpOptions").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateDhcpOptions").equals(reader.getName())) {
object.setCreateDhcpOptions(com.amazon.ec2.CreateDhcpOptionsType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java
index f6d07d3..b49b0a2 100644
--- a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class CreateDhcpOptionsResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateDhcpOptionsResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME =
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateDhcpOptionsResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class CreateDhcpOptionsResponse implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class CreateDhcpOptionsResponse implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java
index 8ab204b..27d6dc6 100644
--- a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java
@@ -125,7 +125,8 @@ public class CreateDhcpOptionsResponseType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class CreateDhcpOptionsResponseType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java
index ef3967c..8c0340e 100644
--- a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java
+++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java
@@ -101,7 +101,8 @@ public class CreateDhcpOptionsType implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -155,9 +156,8 @@ public class CreateDhcpOptionsType implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateImage.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateImage.java b/awsapi/src/com/amazon/ec2/CreateImage.java
index 01ef73c..4e96e68 100644
--- a/awsapi/src/com/amazon/ec2/CreateImage.java
+++ b/awsapi/src/com/amazon/ec2/CreateImage.java
@@ -98,7 +98,8 @@ public class CreateImage implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateImage implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateImageResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateImageResponse.java b/awsapi/src/com/amazon/ec2/CreateImageResponse.java
index b6a187a..1029d4b 100644
--- a/awsapi/src/com/amazon/ec2/CreateImageResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateImageResponse.java
@@ -98,7 +98,8 @@ public class CreateImageResponse implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateImageResponse implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateImageResponse implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateImageResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateImageResponse").equals(reader.getName())) {
object.setCreateImageResponse(com.amazon.ec2.CreateImageResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateImageResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateImageResponseType.java b/awsapi/src/com/amazon/ec2/CreateImageResponseType.java
index b6b15e1..c24d47d 100644
--- a/awsapi/src/com/amazon/ec2/CreateImageResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateImageResponseType.java
@@ -125,7 +125,8 @@ public class CreateImageResponseType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class CreateImageResponseType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateImageType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateImageType.java b/awsapi/src/com/amazon/ec2/CreateImageType.java
index 778c514..9db1851 100644
--- a/awsapi/src/com/amazon/ec2/CreateImageType.java
+++ b/awsapi/src/com/amazon/ec2/CreateImageType.java
@@ -240,7 +240,8 @@ public class CreateImageType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -421,9 +422,8 @@ public class CreateImageType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateInstanceExportTask.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTask.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTask.java
index 6b466b0..2a8cfb5 100644
--- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTask.java
+++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTask.java
@@ -98,7 +98,8 @@ public class CreateInstanceExportTask implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateInstanceExportTask implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponse.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponse.java
index 1d08260..0d8a9d7 100644
--- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class CreateInstanceExportTaskResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateInstanceExportTaskResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "CreateInstanceExportTaskResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class CreateInstanceExportTaskResponse implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class CreateInstanceExportTaskResponse implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponseType.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponseType.java
index 9b347eb..d6e2704 100644
--- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponseType.java
@@ -125,7 +125,8 @@ public class CreateInstanceExportTaskResponseType implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class CreateInstanceExportTaskResponseType implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskType.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskType.java
index 59e379a..696f8c6 100644
--- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskType.java
+++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskType.java
@@ -187,7 +187,8 @@ public class CreateInstanceExportTaskType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -337,9 +338,8 @@ public class CreateInstanceExportTaskType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
[04/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index 27ba7db..7179944 100755
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -37,6 +37,7 @@ import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
@@ -167,14 +168,14 @@ import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.EntityManager;
import com.cloud.utils.db.GlobalLock;
-import com.cloud.utils.db.TransactionCallback;
-import com.cloud.utils.db.TransactionCallbackNoReturn;
-import com.cloud.utils.db.TransactionCallbackWithExceptionNoReturn;
-import com.cloud.utils.db.TransactionStatus;
import com.cloud.utils.db.JoinBuilder.JoinType;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.Transaction;
+import com.cloud.utils.db.TransactionCallback;
+import com.cloud.utils.db.TransactionCallbackNoReturn;
+import com.cloud.utils.db.TransactionCallbackWithExceptionNoReturn;
+import com.cloud.utils.db.TransactionStatus;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.fsm.NoTransitionException;
import com.cloud.utils.fsm.StateMachine2;
@@ -411,36 +412,41 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
NetworkOfferingVO offering = null;
//#1 - quick cloud network offering
if (_networkOfferingDao.findByUniqueName(NetworkOffering.QuickCloudNoServices) == null) {
- offering = _configMgr.createNetworkOffering(NetworkOffering.QuickCloudNoServices, "Offering for QuickCloud with no services", TrafficType.Guest, null, true,
- Availability.Optional, null, new HashMap<Network.Service, Set<Network.Provider>>(), true, Network.GuestType.Shared, false, null, true, null, true, false,
- null, false, null, true);
+ offering =
+ _configMgr.createNetworkOffering(NetworkOffering.QuickCloudNoServices, "Offering for QuickCloud with no services", TrafficType.Guest, null, true,
+ Availability.Optional, null, new HashMap<Network.Service, Set<Network.Provider>>(), true, Network.GuestType.Shared, false, null, true, null,
+ true, false, null, false, null, true);
offering.setState(NetworkOffering.State.Enabled);
_networkOfferingDao.update(offering.getId(), offering);
}
//#2 - SG enabled network offering
if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultSharedNetworkOfferingWithSGService) == null) {
- offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultSharedNetworkOfferingWithSGService, "Offering for Shared Security group enabled networks",
- TrafficType.Guest, null, true, Availability.Optional, null, defaultSharedNetworkOfferingProviders, true, Network.GuestType.Shared, false, null, true, null,
- true, false, null, false, null, true);
+ offering =
+ _configMgr.createNetworkOffering(NetworkOffering.DefaultSharedNetworkOfferingWithSGService,
+ "Offering for Shared Security group enabled networks", TrafficType.Guest, null, true, Availability.Optional, null,
+ defaultSharedNetworkOfferingProviders, true, Network.GuestType.Shared, false, null, true, null, true, false, null, false, null, true);
offering.setState(NetworkOffering.State.Enabled);
_networkOfferingDao.update(offering.getId(), offering);
}
//#3 - shared network offering with no SG service
if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultSharedNetworkOffering) == null) {
- offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultSharedNetworkOffering, "Offering for Shared networks", TrafficType.Guest, null, true,
- Availability.Optional, null, defaultSharedNetworkOfferingProviders, true, Network.GuestType.Shared, false, null, true, null, true, false, null, false,
- null, true);
+ offering =
+ _configMgr.createNetworkOffering(NetworkOffering.DefaultSharedNetworkOffering, "Offering for Shared networks", TrafficType.Guest, null, true,
+ Availability.Optional, null, defaultSharedNetworkOfferingProviders, true, Network.GuestType.Shared, false, null, true, null, true, false,
+ null, false, null, true);
offering.setState(NetworkOffering.State.Enabled);
_networkOfferingDao.update(offering.getId(), offering);
}
//#4 - default isolated offering with Source nat service
if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService) == null) {
- offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService,
- "Offering for Isolated networks with Source Nat service enabled", TrafficType.Guest, null, false, Availability.Required, null,
- defaultIsolatedSourceNatEnabledNetworkOfferingProviders, true, Network.GuestType.Isolated, false, null, true, null, false, false, null, false, null, true);
+ offering =
+ _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService,
+ "Offering for Isolated networks with Source Nat service enabled", TrafficType.Guest, null, false, Availability.Required, null,
+ defaultIsolatedSourceNatEnabledNetworkOfferingProviders, true, Network.GuestType.Isolated, false, null, true, null, false, false, null,
+ false, null, true);
offering.setState(NetworkOffering.State.Enabled);
_networkOfferingDao.update(offering.getId(), offering);
@@ -448,9 +454,10 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
//#5 - default vpc offering with LB service
if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks) == null) {
- offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks,
- "Offering for Isolated VPC networks with Source Nat service enabled", TrafficType.Guest, null, false, Availability.Optional, null, defaultVPCOffProviders,
- true, Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true);
+ offering =
+ _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks,
+ "Offering for Isolated VPC networks with Source Nat service enabled", TrafficType.Guest, null, false, Availability.Optional, null,
+ defaultVPCOffProviders, true, Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true);
offering.setState(NetworkOffering.State.Enabled);
_networkOfferingDao.update(offering.getId(), offering);
}
@@ -459,18 +466,21 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksNoLB) == null) {
//remove LB service
defaultVPCOffProviders.remove(Service.Lb);
- offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksNoLB,
- "Offering for Isolated VPC networks with Source Nat service enabled and LB service disabled", TrafficType.Guest, null, false, Availability.Optional, null,
- defaultVPCOffProviders, true, Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true);
+ offering =
+ _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksNoLB,
+ "Offering for Isolated VPC networks with Source Nat service enabled and LB service disabled", TrafficType.Guest, null, false,
+ Availability.Optional, null, defaultVPCOffProviders, true, Network.GuestType.Isolated, false, null, false, null, false, false, null, false,
+ null, true);
offering.setState(NetworkOffering.State.Enabled);
_networkOfferingDao.update(offering.getId(), offering);
}
//#7 - isolated offering with source nat disabled
if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultIsolatedNetworkOffering) == null) {
- offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOffering, "Offering for Isolated networks with no Source Nat service",
- TrafficType.Guest, null, true, Availability.Optional, null, defaultIsolatedNetworkOfferingProviders, true, Network.GuestType.Isolated, false, null, true,
- null, true, false, null, false, null, true);
+ offering =
+ _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOffering, "Offering for Isolated networks with no Source Nat service",
+ TrafficType.Guest, null, true, Availability.Optional, null, defaultIsolatedNetworkOfferingProviders, true, Network.GuestType.Isolated, false,
+ null, true, null, true, false, null, false, null, true);
offering.setState(NetworkOffering.State.Enabled);
_networkOfferingDao.update(offering.getId(), offering);
}
@@ -492,9 +502,10 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
internalLbOffProviders.put(Service.SourceNat, defaultVpcProvider);
if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB) == null) {
- offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB,
- "Offering for Isolated VPC networks with Internal Lb support", TrafficType.Guest, null, false, Availability.Optional, null, internalLbOffProviders, true,
- Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true);
+ offering =
+ _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB,
+ "Offering for Isolated VPC networks with Internal Lb support", TrafficType.Guest, null, false, Availability.Optional, null,
+ internalLbOffProviders, true, Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true);
offering.setState(NetworkOffering.State.Enabled);
offering.setInternalLb(true);
offering.setPublicLb(false);
@@ -524,9 +535,10 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
serviceCapabilityMap.put(Service.StaticNat, eip);
if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultSharedEIPandELBNetworkOffering) == null) {
- offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultSharedEIPandELBNetworkOffering,
- "Offering for Shared networks with Elastic IP and Elastic LB capabilities", TrafficType.Guest, null, true, Availability.Optional, null,
- netscalerServiceProviders, true, Network.GuestType.Shared, false, null, true, serviceCapabilityMap, true, false, null, false, null, true);
+ offering =
+ _configMgr.createNetworkOffering(NetworkOffering.DefaultSharedEIPandELBNetworkOffering,
+ "Offering for Shared networks with Elastic IP and Elastic LB capabilities", TrafficType.Guest, null, true, Availability.Optional, null,
+ netscalerServiceProviders, true, Network.GuestType.Shared, false, null, true, serviceCapabilityMap, true, false, null, false, null, true);
offering.setState(NetworkOffering.State.Enabled);
offering.setDedicatedLB(false);
_networkOfferingDao.update(offering.getId(), offering);
@@ -556,7 +568,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
podVlanMapSB.and("podId", podVlanMapSB.entity().getPodId(), Op.EQ);
AssignIpAddressFromPodVlanSearch.join("podVlanMapSB", podVlanMapSB, podVlanMapSB.entity().getVlanDbId(), AssignIpAddressFromPodVlanSearch.entity().getVlanId(),
JoinType.INNER);
- AssignIpAddressFromPodVlanSearch.join("vlan", podVlanSearch, podVlanSearch.entity().getId(), AssignIpAddressFromPodVlanSearch.entity().getVlanId(), JoinType.INNER);
+ AssignIpAddressFromPodVlanSearch.join("vlan", podVlanSearch, podVlanSearch.entity().getId(), AssignIpAddressFromPodVlanSearch.entity().getVlanId(),
+ JoinType.INNER);
AssignIpAddressFromPodVlanSearch.done();
@@ -594,9 +607,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
@Override
@DB
- public List<? extends Network> setupNetwork(final Account owner, final NetworkOffering offering, final Network predefined, final DeploymentPlan plan, final String name,
- final String displayText, boolean errorIfAlreadySetup, final Long domainId, final ACLType aclType, final Boolean subdomainAccess, final Long vpcId,
- final Boolean isDisplayNetworkEnabled) throws ConcurrentOperationException {
+ public List<? extends Network> setupNetwork(final Account owner, final NetworkOffering offering, final Network predefined, final DeploymentPlan plan,
+ final String name, final String displayText, boolean errorIfAlreadySetup, final Long domainId, final ACLType aclType, final Boolean subdomainAccess,
+ final Long vpcId, final Boolean isDisplayNetworkEnabled) throws ConcurrentOperationException {
Account locked = _accountDao.acquireInLockTable(owner.getId());
if (locked == null) {
@@ -606,7 +619,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
try {
if (predefined == null ||
(offering.getTrafficType() != TrafficType.Guest && predefined.getCidr() == null && predefined.getBroadcastUri() == null && !(predefined.getBroadcastDomainType() == BroadcastDomainType.Vlan ||
- predefined.getBroadcastDomainType() == BroadcastDomainType.Lswitch || predefined.getBroadcastDomainType() == BroadcastDomainType.Vxlan))) {
+ predefined.getBroadcastDomainType() == BroadcastDomainType.Lswitch || predefined.getBroadcastDomainType() == BroadcastDomainType.Vxlan))) {
List<NetworkVO> configs = _networksDao.listBy(owner.getId(), offering.getId(), plan.getDataCenterId());
if (configs.size() > 0) {
if (s_logger.isDebugEnabled()) {
@@ -614,8 +627,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
}
if (errorIfAlreadySetup) {
- InvalidParameterValueException ex = new InvalidParameterValueException(
- "Found existing network configuration (with specified id) for offering (with specified id)");
+ InvalidParameterValueException ex =
+ new InvalidParameterValueException("Found existing network configuration (with specified id) for offering (with specified id)");
ex.addProxyObject(offering.getUuid(), "offeringId");
ex.addProxyObject(configs.get(0).getUuid(), "networkConfigId");
throw ex;
@@ -653,9 +666,10 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
Transaction.execute(new TransactionCallbackNoReturn() {
@Override
public void doInTransactionWithoutResult(TransactionStatus status) {
- NetworkVO vo = new NetworkVO(id, network, offering.getId(), guru.getName(), owner.getDomainId(), owner.getId(), relatedFile, name, displayText,
- predefined.getNetworkDomain(), offering.getGuestType(), plan.getDataCenterId(), plan.getPhysicalNetworkId(), aclType, offering.getSpecifyIpRanges(),
- vpcId);
+ NetworkVO vo =
+ new NetworkVO(id, network, offering.getId(), guru.getName(), owner.getDomainId(), owner.getId(), relatedFile, name, displayText,
+ predefined.getNetworkDomain(), offering.getGuestType(), plan.getDataCenterId(), plan.getPhysicalNetworkId(), aclType,
+ offering.getSpecifyIpRanges(), vpcId);
vo.setDisplayNetwork(isDisplayNetworkEnabled == null ? true : isDisplayNetworkEnabled);
networks.add(_networksDao.persist(vo, vo.getGuestType() == Network.GuestType.Isolated,
finalizeServicesAndProvidersForNetwork(offering, plan.getPhysicalNetworkId())));
@@ -787,8 +801,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
vo = _nicDao.persist(vo);
Integer networkRate = _networkModel.getNetworkRate(network.getId(), vm.getId());
- NicProfile vmNic = new NicProfile(vo, network, vo.getBroadcastUri(), vo.getIsolationUri(), networkRate, _networkModel.isSecurityGroupSupportedInNetwork(network),
- _networkModel.getNetworkTag(vm.getHypervisorType(), network));
+ NicProfile vmNic =
+ new NicProfile(vo, network, vo.getBroadcastUri(), vo.getIsolationUri(), networkRate, _networkModel.isSecurityGroupSupportedInNetwork(network),
+ _networkModel.getNetworkTag(vm.getHypervisorType(), network));
return new Pair<NicProfile, Integer>(vmNic, Integer.valueOf(deviceId));
}
@@ -1011,7 +1026,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
boolean sharedSourceNat = offering.getSharedSourceNat();
DataCenter zone = _dcDao.findById(network.getDataCenterId());
- if (!sharedSourceNat && _networkModel.areServicesSupportedInNetwork(network.getId(), Service.SourceNat) &&
+ if (!sharedSourceNat &&
+ _networkModel.areServicesSupportedInNetwork(network.getId(), Service.SourceNat) &&
(network.getGuestType() == Network.GuestType.Isolated || (network.getGuestType() == Network.GuestType.Shared && zone.getNetworkType() == NetworkType.Advanced))) {
List<IPAddressVO> ips = null;
@@ -1040,8 +1056,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
// because the serializer would look up the NetworkVO class's table and retrieve the
// network id instead of the physical network id.
// So just throw this exception as is. We may need to TBD by changing the serializer.
- throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + " either doesn't exist or is not enabled in physical network id: " +
- network.getPhysicalNetworkId());
+ throw new CloudRuntimeException("Service provider " + element.getProvider().getName() +
+ " either doesn't exist or is not enabled in physical network id: " + network.getPhysicalNetworkId());
}
if (s_logger.isDebugEnabled()) {
@@ -1049,7 +1065,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
}
if (!element.implement(network, offering, dest, context)) {
- CloudRuntimeException ex = new CloudRuntimeException("Failed to implement provider " + element.getProvider().getName() + " for network with specified id");
+ CloudRuntimeException ex =
+ new CloudRuntimeException("Failed to implement provider " + element.getProvider().getName() + " for network with specified id");
ex.addProxyObject(network.getUuid(), "networkId");
throw ex;
}
@@ -1061,8 +1078,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
if (!reprogramNetworkRules(network.getId(), CallContext.current().getCallingAccount(), network)) {
s_logger.warn("Failed to re-program the network as a part of network " + network + " implement");
// see DataCenterVO.java
- ResourceUnavailableException ex = new ResourceUnavailableException("Unable to apply network rules as a part of network " + network + " implement", DataCenter.class,
- network.getDataCenterId());
+ ResourceUnavailableException ex =
+ new ResourceUnavailableException("Unable to apply network rules as a part of network " + network + " implement", DataCenter.class,
+ network.getDataCenterId());
ex.addProxyObject(_entityMgr.findById(DataCenter.class, network.getDataCenterId()).getUuid());
throw ex;
}
@@ -1095,7 +1113,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
NetworkOfferingVO offering = _networkOfferingDao.findById(network.getNetworkOfferingId());
//there are no egress rules then apply the default egress rule
DataCenter zone = _dcDao.findById(network.getDataCenterId());
- if (offering.getEgressDefaultPolicy() && _networkModel.areServicesSupportedInNetwork(network.getId(), Service.Firewall) &&
+ if (offering.getEgressDefaultPolicy() &&
+ _networkModel.areServicesSupportedInNetwork(network.getId(), Service.Firewall) &&
(network.getGuestType() == Network.GuestType.Isolated || (network.getGuestType() == Network.GuestType.Shared && zone.getNetworkType() == NetworkType.Advanced))) {
// add default egress rule to accept the traffic
_firewallMgr.applyDefaultEgressFirewallRule(network.getId(), true);
@@ -1198,8 +1217,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
}
@Override
- public void prepare(VirtualMachineProfile vmProfile, DeployDestination dest, ReservationContext context) throws InsufficientCapacityException, ConcurrentOperationException,
- ResourceUnavailableException {
+ public void prepare(VirtualMachineProfile vmProfile, DeployDestination dest, ReservationContext context) throws InsufficientCapacityException,
+ ConcurrentOperationException, ResourceUnavailableException {
List<NicVO> nics = _nicDao.listByVmId(vmProfile.getId());
// we have to implement default nics first - to ensure that default network elements start up first in multiple
@@ -1252,7 +1271,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
profile = new NicProfile(nic, network, broadcastUri, isolationUri,
- networkRate, _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vmProfile.getHypervisorType(), network));
+ networkRate, _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vmProfile.getHypervisorType(), network));
guru.reserve(profile, network, vmProfile, dest, context);
nic.setIp4Address(profile.getIp4Address());
nic.setAddressFormat(profile.getFormat());
@@ -1271,8 +1290,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
updateNic(nic, network.getId(), 1);
} else {
- profile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), networkRate, _networkModel.isSecurityGroupSupportedInNetwork(network),
- _networkModel.getNetworkTag(vmProfile.getHypervisorType(), network));
+ profile =
+ new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), networkRate, _networkModel.isSecurityGroupSupportedInNetwork(network),
+ _networkModel.getNetworkTag(vmProfile.getHypervisorType(), network));
guru.updateNicProfile(profile, network);
nic.setState(Nic.State.Reserved);
updateNic(nic, network.getId(), 1);
@@ -1282,14 +1302,15 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
for (NetworkElement element : _networkElements) {
if (providersToImplement.contains(element.getProvider())) {
if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) {
- throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + " either doesn't exist or is not enabled in physical network id: " +
- network.getPhysicalNetworkId());
+ throw new CloudRuntimeException("Service provider " + element.getProvider().getName() +
+ " either doesn't exist or is not enabled in physical network id: " + network.getPhysicalNetworkId());
}
if (s_logger.isDebugEnabled()) {
s_logger.debug("Asking " + element.getName() + " to prepare for " + nic);
}
if (!prepareElement(element, network, profile, vmProfile, dest, context)) {
- throw new InsufficientAddressCapacityException("unable to configure the dhcp service, due to insufficiant address capacity", Network.class, network.getId());
+ throw new InsufficientAddressCapacityException("unable to configure the dhcp service, due to insufficiant address capacity", Network.class,
+ network.getId());
}
}
}
@@ -1308,8 +1329,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
Integer networkRate = _networkModel.getNetworkRate(network.getId(), vm.getId());
NetworkGuru guru = AdapterBase.getAdapterByName(_networkGurus, network.getGuruName());
- NicProfile profile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), networkRate, _networkModel.isSecurityGroupSupportedInNetwork(network),
- _networkModel.getNetworkTag(vm.getHypervisorType(), network));
+ NicProfile profile =
+ new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), networkRate, _networkModel.isSecurityGroupSupportedInNetwork(network),
+ _networkModel.getNetworkTag(vm.getHypervisorType(), network));
if (guru instanceof NetworkMigrationResponder) {
if (!((NetworkMigrationResponder)guru).prepareMigration(profile, network, vm, dest, context)) {
s_logger.error("NetworkGuru " + guru + " prepareForMigration failed."); // XXX: Transaction error
@@ -1319,8 +1341,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
for (NetworkElement element : _networkElements) {
if (providersToImplement.contains(element.getProvider())) {
if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) {
- throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + " either doesn't exist or is not enabled in physical network id: " +
- network.getPhysicalNetworkId());
+ throw new CloudRuntimeException("Service provider " + element.getProvider().getName() +
+ " either doesn't exist or is not enabled in physical network id: " + network.getPhysicalNetworkId());
}
if (element instanceof NetworkMigrationResponder) {
if (!((NetworkMigrationResponder)element).prepareMigration(profile, network, vm, dest, context)) {
@@ -1359,8 +1381,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
for (NetworkElement element : _networkElements) {
if (providersToImplement.contains(element.getProvider())) {
if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) {
- throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + " either doesn't exist or is not enabled in physical network id: " +
- network.getPhysicalNetworkId());
+ throw new CloudRuntimeException("Service provider " + element.getProvider().getName() +
+ " either doesn't exist or is not enabled in physical network id: " + network.getPhysicalNetworkId());
}
if (element instanceof NetworkMigrationResponder) {
((NetworkMigrationResponder)element).commitMigration(nicSrc, network, src, src_context, dst_context);
@@ -1390,8 +1412,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
for (NetworkElement element : _networkElements) {
if (providersToImplement.contains(element.getProvider())) {
if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) {
- throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + " either doesn't exist or is not enabled in physical network id: " +
- network.getPhysicalNetworkId());
+ throw new CloudRuntimeException("Service provider " + element.getProvider().getName() +
+ " either doesn't exist or is not enabled in physical network id: " + network.getPhysicalNetworkId());
}
if (element instanceof NetworkMigrationResponder) {
((NetworkMigrationResponder)element).rollbackMigration(nicDst, network, dst, src_context, dst_context);
@@ -1434,8 +1456,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
NetworkGuru guru = AdapterBase.getAdapterByName(_networkGurus, network.getGuruName());
nic.setState(Nic.State.Releasing);
_nicDao.update(nic.getId(), nic);
- NicProfile profile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), null,
- _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vmProfile.getHypervisorType(), network));
+ NicProfile profile =
+ new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), null, _networkModel.isSecurityGroupSupportedInNetwork(network),
+ _networkModel.getNetworkTag(vmProfile.getHypervisorType(), network));
if (guru.release(profile, vmProfile, nic.getReservationId())) {
applyProfileToNicForRelease(nic, profile);
nic.setState(Nic.State.Allocated);
@@ -1464,8 +1487,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
for (NetworkElement element : _networkElements) {
if (providersToImplement.contains(element.getProvider())) {
if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) {
- throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + " either doesn't exist or is not enabled in physical network id: " +
- network.getPhysicalNetworkId());
+ throw new CloudRuntimeException("Service provider " + element.getProvider().getName() +
+ " either doesn't exist or is not enabled in physical network id: " + network.getPhysicalNetworkId());
}
if (s_logger.isDebugEnabled()) {
s_logger.debug("Asking " + element.getName() + " to release " + profile);
@@ -1499,8 +1522,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
nic.setState(Nic.State.Deallocating);
_nicDao.update(nic.getId(), nic);
NetworkVO network = _networksDao.findById(nic.getNetworkId());
- NicProfile profile = new NicProfile(nic, network, null, null, null, _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(
- vm.getHypervisorType(), network));
+ NicProfile profile =
+ new NicProfile(nic, network, null, null, null, _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vm.getHypervisorType(),
+ network));
/*
* We need to release the nics with a Create ReservationStrategy here
@@ -1511,8 +1535,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
for (NetworkElement element : _networkElements) {
if (providersToImplement.contains(element.getProvider())) {
if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) {
- throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + " either doesn't exist or is not enabled in physical network id: " +
- network.getPhysicalNetworkId());
+ throw new CloudRuntimeException("Service provider " + element.getProvider().getName() +
+ " either doesn't exist or is not enabled in physical network id: " + network.getPhysicalNetworkId());
}
if (s_logger.isDebugEnabled()) {
s_logger.debug("Asking " + element.getName() + " to release " + nic);
@@ -1604,8 +1628,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
@DB
public Network createGuestNetwork(long networkOfferingId, final String name, final String displayText, final String gateway, final String cidr, String vlanId,
String networkDomain, final Account owner, final Long domainId, final PhysicalNetwork pNtwk, final long zoneId, final ACLType aclType, Boolean subdomainAccess,
- final Long vpcId, final String ip6Gateway, final String ip6Cidr, final Boolean isDisplayNetworkEnabled, final String isolatedPvlan) throws ConcurrentOperationException,
- InsufficientCapacityException, ResourceAllocationException {
+ final Long vpcId, final String ip6Gateway, final String ip6Cidr, final Boolean isDisplayNetworkEnabled, final String isolatedPvlan)
+ throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException {
final NetworkOfferingVO ntwkOff = _networkOfferingDao.findById(networkOfferingId);
// this method supports only guest network creation
@@ -1623,7 +1647,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
// Validate network offering
if (ntwkOff.getState() != NetworkOffering.State.Enabled) {
// see NetworkOfferingVO
- InvalidParameterValueException ex = new InvalidParameterValueException("Can't use specified network offering id as its stat is not " + NetworkOffering.State.Enabled);
+ InvalidParameterValueException ex =
+ new InvalidParameterValueException("Can't use specified network offering id as its stat is not " + NetworkOffering.State.Enabled);
ex.addProxyObject(ntwkOff.getUuid(), "networkOfferingId");
throw ex;
}
@@ -1661,8 +1686,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
// if zone is basic, only Shared network offerings w/o source nat service are allowed
if (!(ntwkOff.getGuestType() == GuestType.Shared && !_networkModel.areServicesSupportedByNetworkOffering(ntwkOff.getId(), Service.SourceNat))) {
- throw new InvalidParameterValueException("For zone of type " + NetworkType.Basic + " only offerings of " + "guestType " + GuestType.Shared + " with disabled " +
- Service.SourceNat.getName() + " service are allowed");
+ throw new InvalidParameterValueException("For zone of type " + NetworkType.Basic + " only offerings of " + "guestType " + GuestType.Shared +
+ " with disabled " + Service.SourceNat.getName() + " service are allowed");
}
if (domainId == null || domainId != Domain.ROOT_DOMAIN) {
@@ -1725,7 +1750,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
//don't allow to specify vlan tag used by physical network for dynamic vlan allocation
if (_dcDao.findVnet(zoneId, pNtwk.getId(), vlanId).size() > 0) {
throw new InvalidParameterValueException("The VLAN tag " + vlanId + " is already being used for dynamic vlan allocation for the guest network in zone " +
- zone.getName());
+ zone.getName());
}
String uri = BroadcastDomainType.fromString(vlanId).toString();
// For Isolated networks, don't allow to create network with vlan that already exists in the zone
@@ -1752,8 +1777,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
int vnetsAllocatedToAccount = _datacenterVnetDao.countVnetsAllocatedToAccount(zoneId, owner.getAccountId());
int vnetsDedicatedToAccount = _datacenterVnetDao.countVnetsDedicatedToAccount(zoneId, owner.getAccountId());
if (vnetsAllocatedToAccount < vnetsDedicatedToAccount) {
- throw new InvalidParameterValueException("Specified vlan " + vlanId + " doesn't belong" + " to the vlan range dedicated to the owner " +
- owner.getAccountName());
+ throw new InvalidParameterValueException("Specified vlan " + vlanId + " doesn't belong" +
+ " to the vlan range dedicated to the owner " + owner.getAccountName());
}
}
}
@@ -1762,7 +1787,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
} else {
// don't allow to creating shared network with given Vlan ID, if there already exists a isolated network or
// shared network with same Vlan ID in the zone
- if (_networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Isolated) > 0 || _networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Shared) > 0) {
+ if (_networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Isolated) > 0 ||
+ _networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Shared) > 0) {
throw new InvalidParameterValueException("There is a isolated/shared network with vlan id: " + vlanId + " already exists " + "in zone " + zoneId);
}
}
@@ -1771,8 +1797,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
// If networkDomain is not specified, take it from the global configuration
if (_networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.Dns)) {
- Map<Network.Capability, String> dnsCapabilities = _networkModel.getNetworkOfferingServiceCapabilities(_entityMgr.findById(NetworkOffering.class, networkOfferingId),
- Service.Dns);
+ Map<Network.Capability, String> dnsCapabilities =
+ _networkModel.getNetworkOfferingServiceCapabilities(_entityMgr.findById(NetworkOffering.class, networkOfferingId), Service.Dns);
String isUpdateDnsSupported = dnsCapabilities.get(Capability.AllowDnsSuffixModification);
if (isUpdateDnsSupported == null || !Boolean.valueOf(isUpdateDnsSupported)) {
if (networkDomain != null) {
@@ -1796,10 +1822,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
} else {
// validate network domain
if (!NetUtils.verifyDomainName(networkDomain)) {
- throw new InvalidParameterValueException(
- "Invalid network domain. Total length shouldn't exceed 190 chars. Each domain "
- + "label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', "
- + "and the hyphen ('-'); can't start or end with \"-\"");
+ throw new InvalidParameterValueException("Invalid network domain. Total length shouldn't exceed 190 chars. Each domain "
+ + "label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', "
+ + "and the hyphen ('-'); can't start or end with \"-\"");
}
}
}
@@ -1808,13 +1833,14 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
// In Advance zone Cidr for Shared networks and Isolated networks w/o source nat service can't be NULL - 2.2.x
// limitation, remove after we introduce support for multiple ip ranges
// with different Cidrs for the same Shared network
- boolean cidrRequired = zone.getNetworkType() == NetworkType.Advanced &&
- ntwkOff.getTrafficType() == TrafficType.Guest &&
- (ntwkOff.getGuestType() == GuestType.Shared || (ntwkOff.getGuestType() == GuestType.Isolated && !_networkModel.areServicesSupportedByNetworkOffering(
- ntwkOff.getId(), Service.SourceNat)));
+ boolean cidrRequired =
+ zone.getNetworkType() == NetworkType.Advanced &&
+ ntwkOff.getTrafficType() == TrafficType.Guest &&
+ (ntwkOff.getGuestType() == GuestType.Shared || (ntwkOff.getGuestType() == GuestType.Isolated && !_networkModel.areServicesSupportedByNetworkOffering(
+ ntwkOff.getId(), Service.SourceNat)));
if (cidr == null && ip6Cidr == null && cidrRequired) {
throw new InvalidParameterValueException("StartIp/endIp/gateway/netmask are required when create network of" + " type " + Network.GuestType.Shared +
- " and network of type " + GuestType.Isolated + " with service " + Service.SourceNat.getName() + " disabled");
+ " and network of type " + GuestType.Isolated + " with service " + Service.SourceNat.getName() + " disabled");
}
// No cidr can be specified in Basic zone
@@ -1871,8 +1897,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
}
}
- List<? extends Network> networks = setupNetwork(owner, ntwkOff, userNetwork, plan, name, displayText, true, domainId, aclType, subdomainAccessFinal, vpcId,
- isDisplayNetworkEnabled);
+ List<? extends Network> networks =
+ setupNetwork(owner, ntwkOff, userNetwork, plan, name, displayText, true, domainId, aclType, subdomainAccessFinal, vpcId, isDisplayNetworkEnabled);
Network network = null;
if (networks == null || networks.isEmpty()) {
@@ -2032,7 +2058,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
try {
if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) {
s_logger.warn("Unable to complete shutdown of the network elements due to element: " + element.getName() +
- " either doesn't exist or not enabled in the physical network " + _networkModel.getPhysicalNetworkId(network));
+ " either doesn't exist or not enabled in the physical network " + _networkModel.getPhysicalNetworkId(network));
success = false;
}
if (s_logger.isDebugEnabled()) {
@@ -2120,7 +2146,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
try {
if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) {
s_logger.warn("Unable to complete destroy of the network elements due to element: " + element.getName() +
- " either doesn't exist or not enabled in the physical network " + _networkModel.getPhysicalNetworkId(network));
+ " either doesn't exist or not enabled in the physical network " + _networkModel.getPhysicalNetworkId(network));
success = false;
}
@@ -2327,8 +2353,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
}
@Override
- public boolean restartNetwork(Long networkId, Account callerAccount, User callerUser, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException,
- InsufficientCapacityException {
+ public boolean restartNetwork(Long networkId, Account callerAccount, User callerUser, boolean cleanup) throws ConcurrentOperationException,
+ ResourceUnavailableException, InsufficientCapacityException {
NetworkVO network = _networksDao.findById(networkId);
@@ -2437,9 +2463,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
NetworkOfferingVO networkOffering = _networkOfferingDao.findById(networkOfferingId);
if ((networkOffering.getGuestType() == Network.GuestType.Shared) &&
(_networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.SourceNat) ||
- _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.StaticNat) ||
- _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.Firewall) ||
- _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.PortForwarding) || _networkModel.areServicesSupportedByNetworkOffering(
+ _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.StaticNat) ||
+ _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.Firewall) ||
+ _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.PortForwarding) || _networkModel.areServicesSupportedByNetworkOffering(
networkOfferingId, Service.Lb))) {
return true;
}
@@ -2872,7 +2898,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
if (checkPhysicalNetwork) {
if (!_pNSPDao.isServiceProviderEnabled(physicalNetworkId, provider, service)) {
throw new UnsupportedServiceException("Provider " + provider + " is either not enabled or doesn't " + "support service " + service +
- " in physical network id=" + physicalNetworkId);
+ " in physical network id=" + physicalNetworkId);
}
}
@@ -2972,8 +2998,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
Integer networkRate = _networkModel.getNetworkRate(network.getId(), vm.getId());
NetworkGuru guru = AdapterBase.getAdapterByName(_networkGurus, network.getGuruName());
- NicProfile profile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), networkRate,
- _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vm.getHypervisorType(), network));
+ NicProfile profile =
+ new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), networkRate, _networkModel.isSecurityGroupSupportedInNetwork(network),
+ _networkModel.getNetworkTag(vm.getHypervisorType(), network));
guru.updateNicProfile(profile, network);
profiles.add(profile);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
index d199ab8..fdc2d23 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -31,6 +31,7 @@ import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+
import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
@@ -173,8 +174,9 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
// Find a destination storage pool with the specified criteria
DiskOffering diskOffering = _entityMgr.findById(DiskOffering.class, volume.getDiskOfferingId());
;
- DiskProfile dskCh = new DiskProfile(volume.getId(), volume.getVolumeType(), volume.getName(), diskOffering.getId(), diskOffering.getDiskSize(),
- diskOffering.getTagsArray(), diskOffering.getUseLocalStorage(), diskOffering.isRecreatable(), null);
+ DiskProfile dskCh =
+ new DiskProfile(volume.getId(), volume.getVolumeType(), volume.getName(), diskOffering.getId(), diskOffering.getDiskSize(), diskOffering.getTagsArray(),
+ diskOffering.getUseLocalStorage(), diskOffering.isRecreatable(), null);
dskCh.setHyperType(dataDiskHyperType);
DataCenter destPoolDataCenter = _entityMgr.findById(DataCenter.class, destPoolDcId);
Pod destPoolPod = _entityMgr.findById(Pod.class, destPoolPodId);
@@ -195,8 +197,9 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
}
public VolumeVO allocateDuplicateVolumeVO(Volume oldVol, Long templateId) {
- VolumeVO newVol = new VolumeVO(oldVol.getVolumeType(), oldVol.getName(), oldVol.getDataCenterId(), oldVol.getDomainId(), oldVol.getAccountId(), oldVol.getDiskOfferingId(),
- oldVol.getSize(), oldVol.getMinIops(), oldVol.getMaxIops(), oldVol.get_iScsiName());
+ VolumeVO newVol =
+ new VolumeVO(oldVol.getVolumeType(), oldVol.getName(), oldVol.getDataCenterId(), oldVol.getDomainId(), oldVol.getAccountId(), oldVol.getDiskOfferingId(),
+ oldVol.getSize(), oldVol.getMinIops(), oldVol.getMaxIops(), oldVol.get_iScsiName());
if (templateId != null) {
newVol.setTemplateId(templateId);
} else {
@@ -309,8 +312,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
return new DiskProfile(volume.getId(), volume.getVolumeType(), volume.getName(), diskOffering.getId(), ss.getSize(), diskOffering.getTagsArray(),
diskOffering.getUseLocalStorage(), diskOffering.isRecreatable(), Storage.ImageFormat.ISO != template.getFormat() ? template.getId() : null);
} else {
- return new DiskProfile(volume.getId(), volume.getVolumeType(), volume.getName(), diskOffering.getId(), diskOffering.getDiskSize(), diskOffering.getTagsArray(),
- diskOffering.getUseLocalStorage(), diskOffering.isRecreatable(), null);
+ return new DiskProfile(volume.getId(), volume.getVolumeType(), volume.getName(), diskOffering.getId(), diskOffering.getDiskSize(),
+ diskOffering.getTagsArray(), diskOffering.getUseLocalStorage(), diskOffering.isRecreatable(), null);
}
}
@@ -343,8 +346,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
}
@DB
- public VolumeInfo createVolume(VolumeInfo volume, VirtualMachine vm, VirtualMachineTemplate template, DataCenter dc, Pod pod, Long clusterId, ServiceOffering offering,
- DiskOffering diskOffering, List<StoragePool> avoids, long size, HypervisorType hyperType) {
+ public VolumeInfo createVolume(VolumeInfo volume, VirtualMachine vm, VirtualMachineTemplate template, DataCenter dc, Pod pod, Long clusterId,
+ ServiceOffering offering, DiskOffering diskOffering, List<StoragePool> avoids, long size, HypervisorType hyperType) {
StoragePool pool = null;
if (diskOffering != null && diskOffering.isCustomized()) {
@@ -502,8 +505,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
} else {
size = (size * 1024 * 1024 * 1024);
}
- VolumeVO vol = new VolumeVO(type, name, vm.getDataCenterId(), owner.getDomainId(), owner.getId(), offering.getId(), size, offering.getMinIops(), offering.getMaxIops(),
- null);
+ VolumeVO vol =
+ new VolumeVO(type, name, vm.getDataCenterId(), owner.getDomainId(), owner.getId(), offering.getId(), size, offering.getMinIops(), offering.getMaxIops(), null);
if (vm != null) {
vol.setInstanceId(vm.getId());
}
@@ -523,8 +526,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
// Save usage event and update resource count for user vm volumes
if (vm instanceof UserVm) {
- UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_CREATE, vol.getAccountId(), vol.getDataCenterId(), vol.getId(), vol.getName(), offering.getId(), null, size,
- Volume.class.getName(), vol.getUuid());
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_CREATE, vol.getAccountId(), vol.getDataCenterId(), vol.getId(), vol.getName(), offering.getId(),
+ null, size, Volume.class.getName(), vol.getUuid());
_resourceLimitMgr.incrementResourceCount(vm.getAccountId(), ResourceType.volume);
_resourceLimitMgr.incrementResourceCount(vm.getAccountId(), ResourceType.primary_storage, new Long(vol.getSize()));
@@ -533,15 +536,16 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
}
@Override
- public DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering offering, Long rootDisksize, VirtualMachineTemplate template, VirtualMachine vm, Account owner) {
+ public DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering offering, Long rootDisksize, VirtualMachineTemplate template, VirtualMachine vm,
+ Account owner) {
assert (template.getFormat() != ImageFormat.ISO) : "ISO is not a template really....";
Long size = _tmpltMgr.getTemplateSize(template.getId(), vm.getDataCenterId());
if (rootDisksize != null) {
size = (rootDisksize * 1024 * 1024 * 1024);
}
- VolumeVO vol = new VolumeVO(type, name, vm.getDataCenterId(), owner.getDomainId(), owner.getId(), offering.getId(), size, offering.getMinIops(), offering.getMaxIops(),
- null);
+ VolumeVO vol =
+ new VolumeVO(type, name, vm.getDataCenterId(), owner.getDomainId(), owner.getId(), offering.getId(), size, offering.getMinIops(), offering.getMaxIops(), null);
vol.setFormat(getSupportedImageFormatForCluster(template.getHypervisorType()));
if (vm != null) {
vol.setInstanceId(vm.getId());
@@ -566,8 +570,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
offeringId = offering.getId();
- UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_CREATE, vol.getAccountId(), vol.getDataCenterId(), vol.getId(), vol.getName(), offeringId, null, size,
- Volume.class.getName(), vol.getUuid());
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_CREATE, vol.getAccountId(), vol.getDataCenterId(), vol.getId(), vol.getName(), offeringId, null,
+ size, Volume.class.getName(), vol.getUuid());
_resourceLimitMgr.incrementResourceCount(vm.getAccountId(), ResourceType.volume);
_resourceLimitMgr.incrementResourceCount(vm.getAccountId(), ResourceType.primary_storage, new Long(vol.getSize()));
@@ -594,17 +598,19 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
if (!volume.getFormat().equals(getSupportedImageFormatForCluster(rootDiskHyperType))) {
throw new InvalidParameterValueException("Failed to attach volume to VM since volumes format " + volume.getFormat().getFileExtension() +
- " is not compatible with the vm hypervisor type");
+ " is not compatible with the vm hypervisor type");
}
- VolumeInfo volumeOnPrimary = copyVolumeFromSecToPrimary(volume, vm, rootDiskTmplt, dcVO, pod, rootDiskPool.getClusterId(), svo, diskVO, new ArrayList<StoragePool>(),
- volume.getSize(), rootDiskHyperType);
+ VolumeInfo volumeOnPrimary =
+ copyVolumeFromSecToPrimary(volume, vm, rootDiskTmplt, dcVO, pod, rootDiskPool.getClusterId(), svo, diskVO, new ArrayList<StoragePool>(), volume.getSize(),
+ rootDiskHyperType);
return volumeOnPrimary;
}
@Override
- public VolumeInfo createVolumeOnPrimaryStorage(VirtualMachine vm, Volume rootVolumeOfVm, VolumeInfo volume, HypervisorType rootDiskHyperType) throws NoTransitionException {
+ public VolumeInfo createVolumeOnPrimaryStorage(VirtualMachine vm, Volume rootVolumeOfVm, VolumeInfo volume, HypervisorType rootDiskHyperType)
+ throws NoTransitionException {
VirtualMachineTemplate rootDiskTmplt = _entityMgr.findById(VirtualMachineTemplate.class, vm.getTemplateId());
DataCenter dcVO = _entityMgr.findById(DataCenter.class, vm.getDataCenterId());
Pod pod = _entityMgr.findById(Pod.class, vm.getPodIdToDeployIn());
@@ -639,7 +645,7 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
if (volTemplateId != null && volTemplateId.longValue() != vmTemplateId) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("switchVolume: Old Volume's templateId: " + volTemplateId + " does not match the VM's templateId: " + vmTemplateId +
- ", updating templateId in the new Volume");
+ ", updating templateId in the new Volume");
}
templateIdToUse = vmTemplateId;
}
@@ -696,7 +702,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
for (VolumeVO vol : volumesForVm) {
if (vol.getVolumeType().equals(Type.ROOT)) {
// Destroy volume if not already destroyed
- boolean volumeAlreadyDestroyed = (vol.getState() == Volume.State.Destroy || vol.getState() == Volume.State.Expunged || vol.getState() == Volume.State.Expunging);
+ boolean volumeAlreadyDestroyed =
+ (vol.getState() == Volume.State.Destroy || vol.getState() == Volume.State.Expunged || vol.getState() == Volume.State.Expunging);
if (!volumeAlreadyDestroyed) {
volService.destroyVolume(vol.getId());
} else {
@@ -937,7 +944,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
if (s_logger.isDebugEnabled()) {
s_logger.debug("Local volume " + vol + " cannot be recreated on storagepool " + assignedPool + " assigned by deploymentPlanner");
}
- throw new CloudRuntimeException("Local volume " + vol + " cannot be recreated on storagepool " + assignedPool + " assigned by deploymentPlanner");
+ throw new CloudRuntimeException("Local volume " + vol + " cannot be recreated on storagepool " + assignedPool +
+ " assigned by deploymentPlanner");
} else {
//Check if storage migration is enabled in config
if (StorageHAMigrationEnabled.value()) {
@@ -1040,7 +1048,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
}
@Override
- public void prepare(VirtualMachineProfile vm, DeployDestination dest) throws StorageUnavailableException, InsufficientStorageCapacityException, ConcurrentOperationException {
+ public void prepare(VirtualMachineProfile vm, DeployDestination dest) throws StorageUnavailableException, InsufficientStorageCapacityException,
+ ConcurrentOperationException {
if (dest == null) {
if (s_logger.isDebugEnabled()) {
@@ -1095,8 +1104,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
return true;
}
- public static final ConfigKey<Long> MaxVolumeSize = new ConfigKey<Long>(Long.class, "storage.max.volume.size", "Storage", "2000", "The maximum size for a volume (in GB).",
- true);
+ public static final ConfigKey<Long> MaxVolumeSize = new ConfigKey<Long>(Long.class, "storage.max.volume.size", "Storage", "2000",
+ "The maximum size for a volume (in GB).", true);
public static final ConfigKey<Boolean> RecreatableSystemVmEnabled = new ConfigKey<Boolean>(Boolean.class, "recreate.systemvm.enabled", "Advanced", "false",
"If true, will recreate system vm root disk whenever starting system vm", true);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java
index 0d854dd..86eab58 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java
@@ -25,6 +25,9 @@ import java.util.Map;
import javax.inject.Inject;
import javax.ws.rs.Path;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntityImpl;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceManager;
@@ -35,8 +38,6 @@ import org.apache.cloudstack.engine.datacenter.entity.api.PodEntityImpl;
import org.apache.cloudstack.engine.datacenter.entity.api.StorageEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntityImpl;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
import com.cloud.host.Host;
import com.cloud.host.Status;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java b/engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java
index b0c315a..2c308f0 100644
--- a/engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java
+++ b/engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java
@@ -32,6 +32,7 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
@@ -232,7 +233,7 @@ public class VirtualMachineManagerImplTest {
when(_vmInstance.getType()).thenReturn(VirtualMachine.Type.User);
when(_host.getId()).thenReturn(1L);
when(_hostDao.findById(anyLong())).thenReturn(null);
- when(_entityMgr.findById(Mockito.eq(ServiceOffering.class), anyLong())).thenReturn(getSvcoffering(512));
+ when(_entityMgr.findById(Matchers.eq(ServiceOffering.class), anyLong())).thenReturn(getSvcoffering(512));
when(_workDao.persist(_work)).thenReturn(_work);
when(_workDao.update("1", _work)).thenReturn(true);
when(_work.getId()).thenReturn("1");
@@ -268,8 +269,9 @@ public class VirtualMachineManagerImplTest {
doReturn(1L).when(_vmInstance).getDataCenterId();
doReturn(1L).when(hostVO).getClusterId();
when(CapacityManager.CpuOverprovisioningFactor.valueIn(1L)).thenReturn(1.0f);
- ScaleVmCommand reconfigureCmd = new ScaleVmCommand("myVmName", newServiceOffering.getCpu(), newServiceOffering.getSpeed(), newServiceOffering.getSpeed(),
- newServiceOffering.getRamSize(), newServiceOffering.getRamSize(), newServiceOffering.getLimitCpuUse());
+ ScaleVmCommand reconfigureCmd =
+ new ScaleVmCommand("myVmName", newServiceOffering.getCpu(), newServiceOffering.getSpeed(), newServiceOffering.getSpeed(), newServiceOffering.getRamSize(),
+ newServiceOffering.getRamSize(), newServiceOffering.getLimitCpuUse());
Answer answer = new ScaleVmAnswer(reconfigureCmd, true, "details");
when(_agentMgr.send(2l, reconfigureCmd)).thenReturn(null);
_vmMgr.reConfigureVm(_vmInstance.getUuid(), getSvcoffering(256), false);
@@ -307,7 +309,8 @@ public class VirtualMachineManagerImplTest {
boolean ha = false;
boolean useLocalStorage = false;
- ServiceOfferingVO serviceOffering = new ServiceOfferingVO(name, cpu, ramSize, speed, null, null, ha, displayText, useLocalStorage, false, null, false, null, false);
+ ServiceOfferingVO serviceOffering =
+ new ServiceOfferingVO(name, cpu, ramSize, speed, null, null, ha, displayText, useLocalStorage, false, null, false, null, false);
return serviceOffering;
}
@@ -430,8 +433,8 @@ public class VirtualMachineManagerImplTest {
// Check migration of a vm fails when src and destination pool are not of same type; that is, one is shared and
// other is local.
@Test(expected = CloudRuntimeException.class)
- public void testMigrateWithVolumeFail1() throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException,
- OperationTimedoutException {
+ public void testMigrateWithVolumeFail1() throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException,
+ VirtualMachineMigrationException, OperationTimedoutException {
initializeMockConfigForMigratingVmWithVolumes();
when(_srcHostMock.getClusterId()).thenReturn(3L);
@@ -445,8 +448,8 @@ public class VirtualMachineManagerImplTest {
// Check migration of a vm fails when vm is not in Running state.
@Test(expected = ConcurrentOperationException.class)
- public void testMigrateWithVolumeFail2() throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException,
- OperationTimedoutException {
+ public void testMigrateWithVolumeFail2() throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException,
+ VirtualMachineMigrationException, OperationTimedoutException {
initializeMockConfigForMigratingVmWithVolumes();
when(_srcHostMock.getClusterId()).thenReturn(3L);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java
index 03fe2e6..4aed4d1 100644
--- a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java
+++ b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java
@@ -16,12 +16,13 @@
// under the License.
package org.apache.cloudstack.engine.provisioning.test;
+import org.mockito.Mockito;
+import org.springframework.context.annotation.Bean;
+
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineClusterDao;
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineDataCenterDao;
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostDao;
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostPodDao;
-import org.mockito.Mockito;
-import org.springframework.context.annotation.Bean;
public class ChildTestConfiguration {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java
index 0c9e3ff..c2a9dc7 100644
--- a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java
+++ b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java
@@ -20,38 +20,37 @@
package org.apache.cloudstack.engine.provisioning.test;
import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
import java.util.UUID;
import javax.inject.Inject;
-import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity;
-import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
-import org.apache.cloudstack.engine.datacenter.entity.api.HostEntity;
-import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity;
-import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity;
-import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineClusterDao;
-import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineDataCenterDao;
-import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostDao;
-import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostPodDao;
-import org.apache.cloudstack.engine.service.api.ProvisioningService;
+import junit.framework.TestCase;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Matchers;
import org.mockito.Mockito;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity;
+import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
+import org.apache.cloudstack.engine.datacenter.entity.api.HostEntity;
+import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity;
+import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO;
+import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineClusterDao;
+import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineDataCenterDao;
+import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostDao;
+import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostPodDao;
+import org.apache.cloudstack.engine.service.api.ProvisioningService;
import com.cloud.dc.DataCenter.NetworkType;
-import junit.framework.TestCase;
-
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = "classpath:/resource/provisioningContext.xml")
public class ProvisioningTest extends TestCase {
@@ -71,24 +70,26 @@ public class ProvisioningTest extends TestCase {
@Inject
EngineHostDao _hostDao;
+ @Override
@Before
public void setUp() {
- EngineDataCenterVO dc = new EngineDataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null,
- null, true, true, null, null);
- Mockito.when(dcDao.findByUuid(Mockito.anyString())).thenReturn(dc);
- Mockito.when(dcDao.persist((EngineDataCenterVO)Mockito.anyObject())).thenReturn(dc);
+ EngineDataCenterVO dc =
+ new EngineDataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null,
+ true, true, null, null);
+ Mockito.when(dcDao.findByUuid(Matchers.anyString())).thenReturn(dc);
+ Mockito.when(dcDao.persist((EngineDataCenterVO)Matchers.anyObject())).thenReturn(dc);
EngineHostPodVO pod = new EngineHostPodVO("lab", 123, "10.0.0.1", "10.0.0.1", 24, "test");
- Mockito.when(_podDao.findByUuid(Mockito.anyString())).thenReturn(pod);
- Mockito.when(_podDao.persist((EngineHostPodVO)Mockito.anyObject())).thenReturn(pod);
+ Mockito.when(_podDao.findByUuid(Matchers.anyString())).thenReturn(pod);
+ Mockito.when(_podDao.persist((EngineHostPodVO)Matchers.anyObject())).thenReturn(pod);
EngineClusterVO cluster = new EngineClusterVO();
- Mockito.when(_clusterDao.findByUuid(Mockito.anyString())).thenReturn(cluster);
- Mockito.when(_clusterDao.persist((EngineClusterVO)Mockito.anyObject())).thenReturn(cluster);
+ Mockito.when(_clusterDao.findByUuid(Matchers.anyString())).thenReturn(cluster);
+ Mockito.when(_clusterDao.persist((EngineClusterVO)Matchers.anyObject())).thenReturn(cluster);
EngineHostVO host = new EngineHostVO("68765876598");
- Mockito.when(_hostDao.findByUuid(Mockito.anyString())).thenReturn(host);
- Mockito.when(_hostDao.persist((EngineHostVO)Mockito.anyObject())).thenReturn(host);
+ Mockito.when(_hostDao.findByUuid(Matchers.anyString())).thenReturn(host);
+ Mockito.when(_hostDao.persist((EngineHostVO)Matchers.anyObject())).thenReturn(host);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/capacity/CapacityVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/capacity/CapacityVO.java b/engine/schema/src/com/cloud/capacity/CapacityVO.java
index b430d06..8df5c86 100755
--- a/engine/schema/src/com/cloud/capacity/CapacityVO.java
+++ b/engine/schema/src/com/cloud/capacity/CapacityVO.java
@@ -16,7 +16,6 @@
// under the License.
package com.cloud.capacity;
-import javax.persistence.Transient;
import java.util.Date;
import javax.persistence.Column;
@@ -27,9 +26,9 @@ import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
+import javax.persistence.Transient;
import com.cloud.utils.db.GenericDao;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = "op_host_capacity")
[10/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java b/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java
index 43b3c5a..278d11b 100644
--- a/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java
+++ b/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java
@@ -235,9 +235,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
public com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatusResponse getBucketLoggingStatus(
- com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatus getBucketLoggingStatus0)
+ com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatus getBucketLoggingStatus0)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -254,8 +254,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getBucketLoggingStatus0, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "getBucketLoggingStatus")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getBucketLoggingStatus0, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "getBucketLoggingStatus")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -268,11 +269,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatusResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatusResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatusResponse)object;
@@ -333,11 +335,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void startgetBucketLoggingStatus(
- com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatus getBucketLoggingStatus0,
+ com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatus getBucketLoggingStatus0,
- final com.amazon.s3.client.AmazonS3CallbackHandler callback)
+ final com.amazon.s3.client.AmazonS3CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[0].getName());
_operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/GetBucketLoggingStatusRequest");
@@ -351,8 +353,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getBucketLoggingStatus0, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "getBucketLoggingStatus")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getBucketLoggingStatus0, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "getBucketLoggingStatus")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -367,8 +370,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatusResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatusResponse.class,
+ getEnvelopeNamespaces(resultEnv));
callback.receiveResultgetBucketLoggingStatus((com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatusResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -463,9 +467,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
public com.amazon.s3.client.AmazonS3Stub.CopyObjectResponse copyObject(
- com.amazon.s3.client.AmazonS3Stub.CopyObject copyObject2)
+ com.amazon.s3.client.AmazonS3Stub.CopyObject copyObject2)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -482,8 +486,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), copyObject2, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "copyObject")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), copyObject2, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "copyObject")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -496,10 +501,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.CopyObjectResponse.class, getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.CopyObjectResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.s3.client.AmazonS3Stub.CopyObjectResponse)object;
@@ -560,11 +567,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void startcopyObject(
- com.amazon.s3.client.AmazonS3Stub.CopyObject copyObject2,
+ com.amazon.s3.client.AmazonS3Stub.CopyObject copyObject2,
- final com.amazon.s3.client.AmazonS3CallbackHandler callback)
+ final com.amazon.s3.client.AmazonS3CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[1].getName());
_operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/CopyObjectRequest");
@@ -578,8 +585,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), copyObject2, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "copyObject")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), copyObject2, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "copyObject")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -594,8 +602,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.CopyObjectResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.CopyObjectResponse.class, getEnvelopeNamespaces(resultEnv));
callback.receiveResultcopyObject((com.amazon.s3.client.AmazonS3Stub.CopyObjectResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -690,9 +698,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
public com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicyResponse getBucketAccessControlPolicy(
- com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicy getBucketAccessControlPolicy4)
+ com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicy getBucketAccessControlPolicy4)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -709,8 +717,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getBucketAccessControlPolicy4, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "getBucketAccessControlPolicy")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getBucketAccessControlPolicy4, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "getBucketAccessControlPolicy")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -723,11 +732,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicyResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicyResponse.class,
+ getEnvelopeNamespaces(_returnEnv));
return (com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicyResponse)object;
@@ -788,11 +799,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void startgetBucketAccessControlPolicy(
- com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicy getBucketAccessControlPolicy4,
+ com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicy getBucketAccessControlPolicy4,
- final com.amazon.s3.client.AmazonS3CallbackHandler callback)
+ final com.amazon.s3.client.AmazonS3CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[2].getName());
_operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/GetBucketAccessControlPolicyRequest");
@@ -806,8 +817,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getBucketAccessControlPolicy4, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "getBucketAccessControlPolicy")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getBucketAccessControlPolicy4, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "getBucketAccessControlPolicy")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -822,8 +834,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicyResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicyResponse.class,
+ getEnvelopeNamespaces(resultEnv));
callback.receiveResultgetBucketAccessControlPolicy((com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicyResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -918,9 +931,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
public com.amazon.s3.client.AmazonS3Stub.ListBucketResponse listBucket(
- com.amazon.s3.client.AmazonS3Stub.ListBucket listBucket6)
+ com.amazon.s3.client.AmazonS3Stub.ListBucket listBucket6)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -937,8 +950,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), listBucket6, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "listBucket")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), listBucket6, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "listBucket")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -951,10 +965,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.ListBucketResponse.class, getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.ListBucketResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.s3.client.AmazonS3Stub.ListBucketResponse)object;
@@ -1015,11 +1031,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void startlistBucket(
- com.amazon.s3.client.AmazonS3Stub.ListBucket listBucket6,
+ com.amazon.s3.client.AmazonS3Stub.ListBucket listBucket6,
- final com.amazon.s3.client.AmazonS3CallbackHandler callback)
+ final com.amazon.s3.client.AmazonS3CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[3].getName());
_operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/ListBucketRequest");
@@ -1033,8 +1049,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), listBucket6, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "listBucket")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), listBucket6, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "listBucket")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -1049,8 +1066,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.ListBucketResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.ListBucketResponse.class, getEnvelopeNamespaces(resultEnv));
callback.receiveResultlistBucket((com.amazon.s3.client.AmazonS3Stub.ListBucketResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -1145,9 +1162,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
public com.amazon.s3.client.AmazonS3Stub.PutObjectResponse putObject(
- com.amazon.s3.client.AmazonS3Stub.PutObject putObject8)
+ com.amazon.s3.client.AmazonS3Stub.PutObject putObject8)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -1164,8 +1181,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), putObject8, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "putObject")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), putObject8, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "putObject")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -1178,10 +1196,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.PutObjectResponse.class, getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.PutObjectResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.s3.client.AmazonS3Stub.PutObjectResponse)object;
@@ -1242,11 +1262,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void startputObject(
- com.amazon.s3.client.AmazonS3Stub.PutObject putObject8,
+ com.amazon.s3.client.AmazonS3Stub.PutObject putObject8,
- final com.amazon.s3.client.AmazonS3CallbackHandler callback)
+ final com.amazon.s3.client.AmazonS3CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[4].getName());
_operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/PutObjectRequest");
@@ -1260,8 +1280,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), putObject8, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "putObject")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), putObject8, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "putObject")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -1276,8 +1297,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.PutObjectResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.PutObjectResponse.class, getEnvelopeNamespaces(resultEnv));
callback.receiveResultputObject((com.amazon.s3.client.AmazonS3Stub.PutObjectResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -1372,9 +1393,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
public com.amazon.s3.client.AmazonS3Stub.CreateBucketResponse createBucket(
- com.amazon.s3.client.AmazonS3Stub.CreateBucket createBucket10)
+ com.amazon.s3.client.AmazonS3Stub.CreateBucket createBucket10)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -1391,8 +1412,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createBucket10, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "createBucket")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createBucket10, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "createBucket")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -1405,11 +1427,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.CreateBucketResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.CreateBucketResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.s3.client.AmazonS3Stub.CreateBucketResponse)object;
@@ -1470,11 +1493,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void startcreateBucket(
- com.amazon.s3.client.AmazonS3Stub.CreateBucket createBucket10,
+ com.amazon.s3.client.AmazonS3Stub.CreateBucket createBucket10,
- final com.amazon.s3.client.AmazonS3CallbackHandler callback)
+ final com.amazon.s3.client.AmazonS3CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[5].getName());
_operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/CreateBucketRequest");
@@ -1488,8 +1511,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createBucket10, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "createBucket")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createBucket10, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "createBucket")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -1504,8 +1528,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.CreateBucketResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.CreateBucketResponse.class, getEnvelopeNamespaces(resultEnv));
callback.receiveResultcreateBucket((com.amazon.s3.client.AmazonS3Stub.CreateBucketResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -1600,9 +1624,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
public com.amazon.s3.client.AmazonS3Stub.ListAllMyBucketsResponse listAllMyBuckets(
- com.amazon.s3.client.AmazonS3Stub.ListAllMyBuckets listAllMyBuckets12)
+ com.amazon.s3.client.AmazonS3Stub.ListAllMyBuckets listAllMyBuckets12)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -1619,8 +1643,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), listAllMyBuckets12, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "listAllMyBuckets")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), listAllMyBuckets12, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "listAllMyBuckets")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -1633,11 +1658,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.ListAllMyBucketsResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.ListAllMyBucketsResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.s3.client.AmazonS3Stub.ListAllMyBucketsResponse)object;
@@ -1698,11 +1724,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void startlistAllMyBuckets(
- com.amazon.s3.client.AmazonS3Stub.ListAllMyBuckets listAllMyBuckets12,
+ com.amazon.s3.client.AmazonS3Stub.ListAllMyBuckets listAllMyBuckets12,
- final com.amazon.s3.client.AmazonS3CallbackHandler callback)
+ final com.amazon.s3.client.AmazonS3CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[6].getName());
_operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/ListAllMyBucketsRequest");
@@ -1716,8 +1742,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), listAllMyBuckets12, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "listAllMyBuckets")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), listAllMyBuckets12, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "listAllMyBuckets")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -1732,8 +1759,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.ListAllMyBucketsResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.ListAllMyBucketsResponse.class, getEnvelopeNamespaces(resultEnv));
callback.receiveResultlistAllMyBuckets((com.amazon.s3.client.AmazonS3Stub.ListAllMyBucketsResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -1828,9 +1855,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
public com.amazon.s3.client.AmazonS3Stub.GetObjectResponse getObject(
- com.amazon.s3.client.AmazonS3Stub.GetObject getObject14)
+ com.amazon.s3.client.AmazonS3Stub.GetObject getObject14)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -1847,8 +1874,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObject14, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "getObject")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObject14, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "getObject")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -1861,10 +1889,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectResponse.class, getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.s3.client.AmazonS3Stub.GetObjectResponse)object;
@@ -1925,11 +1955,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void startgetObject(
- com.amazon.s3.client.AmazonS3Stub.GetObject getObject14,
+ com.amazon.s3.client.AmazonS3Stub.GetObject getObject14,
- final com.amazon.s3.client.AmazonS3CallbackHandler callback)
+ final com.amazon.s3.client.AmazonS3CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[7].getName());
_operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/GetObjectRequest");
@@ -1943,8 +1973,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObject14, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "getObject")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObject14, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "getObject")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -1959,8 +1990,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectResponse.class, getEnvelopeNamespaces(resultEnv));
callback.receiveResultgetObject((com.amazon.s3.client.AmazonS3Stub.GetObjectResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -2055,9 +2086,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
public com.amazon.s3.client.AmazonS3Stub.DeleteBucketResponse deleteBucket(
- com.amazon.s3.client.AmazonS3Stub.DeleteBucket deleteBucket16)
+ com.amazon.s3.client.AmazonS3Stub.DeleteBucket deleteBucket16)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -2074,8 +2105,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteBucket16, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "deleteBucket")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteBucket16, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "deleteBucket")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -2088,11 +2120,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.DeleteBucketResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.DeleteBucketResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.s3.client.AmazonS3Stub.DeleteBucketResponse)object;
@@ -2153,11 +2186,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void startdeleteBucket(
- com.amazon.s3.client.AmazonS3Stub.DeleteBucket deleteBucket16,
+ com.amazon.s3.client.AmazonS3Stub.DeleteBucket deleteBucket16,
- final com.amazon.s3.client.AmazonS3CallbackHandler callback)
+ final com.amazon.s3.client.AmazonS3CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[8].getName());
_operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/DeleteBucketRequest");
@@ -2171,8 +2204,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteBucket16, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "deleteBucket")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteBucket16, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "deleteBucket")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -2187,8 +2221,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.DeleteBucketResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.DeleteBucketResponse.class, getEnvelopeNamespaces(resultEnv));
callback.receiveResultdeleteBucket((com.amazon.s3.client.AmazonS3Stub.DeleteBucketResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -2283,9 +2317,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
public com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatusResponse setBucketLoggingStatus(
- com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatus setBucketLoggingStatus18)
+ com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatus setBucketLoggingStatus18)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -2302,8 +2336,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setBucketLoggingStatus18, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "setBucketLoggingStatus")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setBucketLoggingStatus18, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "setBucketLoggingStatus")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -2316,11 +2351,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatusResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatusResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatusResponse)object;
@@ -2381,11 +2417,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void startsetBucketLoggingStatus(
- com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatus setBucketLoggingStatus18,
+ com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatus setBucketLoggingStatus18,
- final com.amazon.s3.client.AmazonS3CallbackHandler callback)
+ final com.amazon.s3.client.AmazonS3CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[9].getName());
_operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/SetBucketLoggingStatusRequest");
@@ -2399,8 +2435,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setBucketLoggingStatus18, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "setBucketLoggingStatus")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setBucketLoggingStatus18, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "setBucketLoggingStatus")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -2415,8 +2452,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatusResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatusResponse.class,
+ getEnvelopeNamespaces(resultEnv));
callback.receiveResultsetBucketLoggingStatus((com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatusResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -2511,9 +2549,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
public com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicyResponse getObjectAccessControlPolicy(
- com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicy getObjectAccessControlPolicy20)
+ com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicy getObjectAccessControlPolicy20)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -2530,8 +2568,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObjectAccessControlPolicy20, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "getObjectAccessControlPolicy")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObjectAccessControlPolicy20, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "getObjectAccessControlPolicy")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -2544,11 +2583,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicyResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicyResponse.class,
+ getEnvelopeNamespaces(_returnEnv));
return (com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicyResponse)object;
@@ -2609,11 +2650,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void startgetObjectAccessControlPolicy(
- com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicy getObjectAccessControlPolicy20,
+ com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicy getObjectAccessControlPolicy20,
- final com.amazon.s3.client.AmazonS3CallbackHandler callback)
+ final com.amazon.s3.client.AmazonS3CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[10].getName());
_operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/GetObjectAccessControlPolicyRequest");
@@ -2627,8 +2668,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObjectAccessControlPolicy20, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "getObjectAccessControlPolicy")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObjectAccessControlPolicy20, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "getObjectAccessControlPolicy")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -2643,8 +2685,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicyResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicyResponse.class,
+ getEnvelopeNamespaces(resultEnv));
callback.receiveResultgetObjectAccessControlPolicy((com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicyResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -2739,9 +2782,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
public com.amazon.s3.client.AmazonS3Stub.DeleteObjectResponse deleteObject(
- com.amazon.s3.client.AmazonS3Stub.DeleteObject deleteObject22)
+ com.amazon.s3.client.AmazonS3Stub.DeleteObject deleteObject22)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -2758,8 +2801,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteObject22, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "deleteObject")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteObject22, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "deleteObject")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -2772,11 +2816,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.DeleteObjectResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.DeleteObjectResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.s3.client.AmazonS3Stub.DeleteObjectResponse)object;
@@ -2837,11 +2882,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void startdeleteObject(
- com.amazon.s3.client.AmazonS3Stub.DeleteObject deleteObject22,
+ com.amazon.s3.client.AmazonS3Stub.DeleteObject deleteObject22,
- final com.amazon.s3.client.AmazonS3CallbackHandler callback)
+ final com.amazon.s3.client.AmazonS3CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[11].getName());
_operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/DeleteObjectRequest");
@@ -2855,8 +2900,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteObject22, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "deleteObject")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteObject22, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "deleteObject")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -2871,8 +2917,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.DeleteObjectResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.DeleteObjectResponse.class, getEnvelopeNamespaces(resultEnv));
callback.receiveResultdeleteObject((com.amazon.s3.client.AmazonS3Stub.DeleteObjectResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -2967,9 +3013,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
public com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicyResponse setBucketAccessControlPolicy(
- com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicy setBucketAccessControlPolicy24)
+ com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicy setBucketAccessControlPolicy24)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -2986,8 +3032,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setBucketAccessControlPolicy24, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "setBucketAccessControlPolicy")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setBucketAccessControlPolicy24, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "setBucketAccessControlPolicy")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -3000,11 +3047,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicyResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicyResponse.class,
+ getEnvelopeNamespaces(_returnEnv));
return (com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicyResponse)object;
@@ -3065,11 +3114,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void startsetBucketAccessControlPolicy(
- com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicy setBucketAccessControlPolicy24,
+ com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicy setBucketAccessControlPolicy24,
- final com.amazon.s3.client.AmazonS3CallbackHandler callback)
+ final com.amazon.s3.client.AmazonS3CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[12].getName());
_operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/SetBucketAccessControlPolicyRequest");
@@ -3083,8 +3132,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setBucketAccessControlPolicy24, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "setBucketAccessControlPolicy")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setBucketAccessControlPolicy24, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "setBucketAccessControlPolicy")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -3099,8 +3149,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicyResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicyResponse.class,
+ getEnvelopeNamespaces(resultEnv));
callback.receiveResultsetBucketAccessControlPolicy((com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicyResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -3195,9 +3246,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
public com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicyResponse setObjectAccessControlPolicy(
- com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicy setObjectAccessControlPolicy26)
+ com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicy setObjectAccessControlPolicy26)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -3214,8 +3265,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setObjectAccessControlPolicy26, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "setObjectAccessControlPolicy")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setObjectAccessControlPolicy26, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "setObjectAccessControlPolicy")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -3228,11 +3280,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicyResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicyResponse.class,
+ getEnvelopeNamespaces(_returnEnv));
return (com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicyResponse)object;
@@ -3293,11 +3347,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void startsetObjectAccessControlPolicy(
- com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicy setObjectAccessControlPolicy26,
+ com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicy setObjectAccessControlPolicy26,
- final com.amazon.s3.client.AmazonS3CallbackHandler callback)
+ final com.amazon.s3.client.AmazonS3CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[13].getName());
_operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/SetObjectAccessControlPolicyRequest");
@@ -3311,8 +3365,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setObjectAccessControlPolicy26, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "setObjectAccessControlPolicy")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setObjectAccessControlPolicy26, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "setObjectAccessControlPolicy")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -3327,8 +3382,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicyResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicyResponse.class,
+ getEnvelopeNamespaces(resultEnv));
callback.receiveResultsetObjectAccessControlPolicy((com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicyResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -3423,9 +3479,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
public com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse putObjectInline(
- com.amazon.s3.client.AmazonS3Stub.PutObjectInline putObjectInline28)
+ com.amazon.s3.client.AmazonS3Stub.PutObjectInline putObjectInline28)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -3442,8 +3498,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), putObjectInline28, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "putObjectInline")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), putObjectInline28, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "putObjectInline")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -3456,11 +3513,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse)object;
@@ -3521,11 +3579,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void startputObjectInline(
- com.amazon.s3.client.AmazonS3Stub.PutObjectInline putObjectInline28,
+ com.amazon.s3.client.AmazonS3Stub.PutObjectInline putObjectInline28,
- final com.amazon.s3.client.AmazonS3CallbackHandler callback)
+ final com.amazon.s3.client.AmazonS3CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[14].getName());
_operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/PutObjectInlineRequest");
@@ -3539,8 +3597,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), putObjectInline28, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "putObjectInline")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), putObjectInline28, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "putObjectInline")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -3555,8 +3614,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse.class, getEnvelopeNamespaces(resultEnv));
callback.receiveResultputObjectInline((com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -3651,9 +3710,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
public com.amazon.s3.client.AmazonS3Stub.GetObjectExtendedResponse getObjectExtended(
- com.amazon.s3.client.AmazonS3Stub.GetObjectExtended getObjectExtended30)
+ com.amazon.s3.client.AmazonS3Stub.GetObjectExtended getObjectExtended30)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -3670,8 +3729,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObjectExtended30, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "getObjectExtended")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObjectExtended30, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "getObjectExtended")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -3684,11 +3744,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectExtendedResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectExtendedResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.s3.client.AmazonS3Stub.GetObjectExtendedResponse)object;
@@ -3749,11 +3810,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void startgetObjectExtended(
- com.amazon.s3.client.AmazonS3Stub.GetObjectExtended getObjectExtended30,
+ com.amazon.s3.client.AmazonS3Stub.GetObjectExtended getObjectExtended30,
- final com.amazon.s3.client.AmazonS3CallbackHandler callback)
+ final com.amazon.s3.client.AmazonS3CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[15].getName());
_operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/GetObjectExtendedRequest");
@@ -3767,8 +3828,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObjectExtended30, optimizeContent(new javax.xml.namespace.QName(
- "http://s3.amazonaws.com/doc/2006-03-01/", "getObjectExtended")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObjectExtended30, optimizeContent(new javax.xml.namespace.QName(
+ "http://s3.amazonaws.com/doc/2006-03-01/", "getObjectExtended")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -3783,8 +3845,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectExtendedResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectExtendedResponse.class, getEnvelopeNamespaces(resultEnv));
callback.receiveResultgetObjectExtended((com.amazon.s3.client.AmazonS3Stub.GetObjectExtendedResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -4058,7 +4120,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -4233,8 +4296,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
/**
* Util method to write an attribute without the ns prefix
*/
- private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void
+ writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter)
+ throws javax.xml.stream.XMLStreamException {
java.lang.String attributeNamespace = qname.getNamespaceURI();
java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
@@ -4596,7 +4660,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -4737,8 +4802,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
/**
* Util method to write an attribute without the ns prefix
*/
- private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void
+ writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter)
+ throws javax.xml.stream.XMLStreamException {
java.lang.String attributeNamespace = qname.getNamespaceURI();
java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
@@ -5416,7 +5482,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -5714,7 +5781,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
if (localCommonPrefixes != null) {
for (int i = 0; i < localCommonPrefixes.length; i++) {
if (localCommonPrefixes[i] != null) {
- localCommonPrefixes[i].serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CommonPrefixes"), factory, xmlWriter);
+ localCommonPrefixes[i].serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CommonPrefixes"), factory,
+ xmlWriter);
} else {
// we don't have to do any thing since minOccures is zero
@@ -5763,8 +5831,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
/**
* Util method to write an attribute without the ns prefix
*/
- private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void
+ writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter)
+ throws javax.xml.stream.XMLStreamException {
java.lang.String attributeNamespace = qname.getNamespaceURI();
java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
@@ -6560,7 +6629,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -6832,8 +6902,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
/**
* Util method to write an attribute without the ns prefix
*/
- private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void
+ writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter)
+ throws javax.xml.stream.XMLStreamException {
java.lang.String attributeNamespace = qname.getNamespaceURI();
java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
@@ -7289,7 +7360,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -7383,8 +7455,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
/**
* Util method to write an attribute without the ns prefix
*/
- private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void
+ writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter)
+ throws javax.xml.stream.XMLStreamException {
java.lang.String attributeNamespace = qname.getNamespaceURI();
java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
@@ -8074,7 +8147,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -8429,8 +8503,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
/**
* Util method to write an attribute without the ns prefix
*/
- private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void
+ writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter)
+ throws javax.xml.stream.XMLStreamException {
java.lang.String attributeNamespace = qname.getNamespaceURI();
java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
@@ -8784,7 +8859,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
} else {
if (reader.getEventType() == javax.xml.stream.XMLStreamConstants.START_ELEMENT &&
reader.getName().equals(
- new javax.xml.namespace.QName(org.apache.axiom.om.impl.MTOMConstants.XOP_NAMESPACE_URI, org.apache.axiom.om.impl.MTOMConstants.XOP_INCLUDE))) {
+ new javax.xml.namespace.QName(org.apache.axiom.om.impl.MTOMConstants.XOP_NAMESPACE_URI,
+ org.apache.axiom.om.impl.MTOMConstants.XOP_INCLUDE))) {
java.lang.String id = org.apache.axiom.om.util.ElementHelper.getContentID(reader, "UTF-8");
object.setData(((org.apache.axiom.soap.impl.builder.MTOMStAXSOAPModelBuilder)((org.apache.axiom.om.impl.llom.OMStAXWrapper)reader).getBuilder()).getDataHandler(id));
reader.next();
@@ -9017,7 +9093,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -9126,8 +9203,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
/**
* Util method to write an attribute without the ns prefix
*/
- private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void
+ writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter)
+ throws javax.xml.stream.XMLStreamException {
java.lang.String attributeNamespace = qname.getNamespaceURI();
java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace);
@@ -9436,7 +9514,8 @@ public class AmazonS3Stub ext
<TRUNCATED>
[33/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java b/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java
index 831a6db..b2da751 100644
--- a/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java
+++ b/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java
@@ -98,7 +98,8 @@ public class CreateSecurityGroup implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateSecurityGroup implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateSecurityGroup implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSecurityGroup").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSecurityGroup").equals(reader.getName())) {
object.setCreateSecurityGroup(com.amazon.ec2.CreateSecurityGroupType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java b/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java
index 9fe5f41..e739ae4 100644
--- a/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class CreateSecurityGroupResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSecurityGroupResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSecurityGroupResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class CreateSecurityGroupResponse implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class CreateSecurityGroupResponse implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java b/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java
index 725b55f..27bb0fd 100644
--- a/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java
@@ -149,7 +149,8 @@ public class CreateSecurityGroupResponseType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -291,9 +292,8 @@ public class CreateSecurityGroupResponseType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java b/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java
index e09ddc2..52ebace 100644
--- a/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java
@@ -163,7 +163,8 @@ public class CreateSecurityGroupType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -308,9 +309,8 @@ public class CreateSecurityGroupType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateSnapshot.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSnapshot.java b/awsapi/src/com/amazon/ec2/CreateSnapshot.java
index 13ecb5d..1d32912 100644
--- a/awsapi/src/com/amazon/ec2/CreateSnapshot.java
+++ b/awsapi/src/com/amazon/ec2/CreateSnapshot.java
@@ -98,7 +98,8 @@ public class CreateSnapshot implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateSnapshot implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateSnapshot implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSnapshot").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSnapshot").equals(reader.getName())) {
object.setCreateSnapshot(com.amazon.ec2.CreateSnapshotType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java b/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java
index 1a307c4..93a1e5c 100644
--- a/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java
@@ -98,7 +98,8 @@ public class CreateSnapshotResponse implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateSnapshotResponse implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateSnapshotResponse implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSnapshotResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSnapshotResponse").equals(reader.getName())) {
object.setCreateSnapshotResponse(com.amazon.ec2.CreateSnapshotResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java b/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java
index 9d90cbb..3a0453d 100644
--- a/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java
@@ -307,7 +307,8 @@ public class CreateSnapshotResponseType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -644,9 +645,8 @@ public class CreateSnapshotResponseType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateSnapshotType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSnapshotType.java b/awsapi/src/com/amazon/ec2/CreateSnapshotType.java
index 82a89c8..4278e08 100644
--- a/awsapi/src/com/amazon/ec2/CreateSnapshotType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSnapshotType.java
@@ -139,7 +139,8 @@ public class CreateSnapshotType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -252,9 +253,8 @@ public class CreateSnapshotType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java
index 665d9a0..f9ba576 100644
--- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java
+++ b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class CreateSpotDatafeedSubscription implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSpotDatafeedSubscription", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSpotDatafeedSubscription",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class CreateSpotDatafeedSubscription implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class CreateSpotDatafeedSubscription implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java
index db2b10a..b52f495 100644
--- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java
@@ -30,8 +30,8 @@ package com.amazon.ec2;
public class CreateSpotDatafeedSubscriptionResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSpotDatafeedSubscriptionResponse",
- "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "CreateSpotDatafeedSubscriptionResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -99,7 +99,8 @@ public class CreateSpotDatafeedSubscriptionResponse implements org.apache.axis2.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -119,9 +120,8 @@ public class CreateSpotDatafeedSubscriptionResponse implements org.apache.axis2.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java
index c5b3eb0..3193fc3 100644
--- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java
@@ -125,7 +125,8 @@ public class CreateSpotDatafeedSubscriptionResponseType implements org.apache.ax
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class CreateSpotDatafeedSubscriptionResponseType implements org.apache.ax
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -445,7 +445,8 @@ public class CreateSpotDatafeedSubscriptionResponseType implements org.apache.ax
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotDatafeedSubscription").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotDatafeedSubscription").equals(reader.getName())) {
object.setSpotDatafeedSubscription(com.amazon.ec2.SpotDatafeedSubscriptionType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java
index 90691b5..0d5c540 100644
--- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java
@@ -125,7 +125,8 @@ public class CreateSpotDatafeedSubscriptionType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class CreateSpotDatafeedSubscriptionType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateSubnet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSubnet.java b/awsapi/src/com/amazon/ec2/CreateSubnet.java
index d14ef8f..5023b6f 100644
--- a/awsapi/src/com/amazon/ec2/CreateSubnet.java
+++ b/awsapi/src/com/amazon/ec2/CreateSubnet.java
@@ -98,7 +98,8 @@ public class CreateSubnet implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateSubnet implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java b/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java
index 0937c4c..4bb8ac4 100644
--- a/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java
@@ -98,7 +98,8 @@ public class CreateSubnetResponse implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateSubnetResponse implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateSubnetResponse implements org.apache.axis2.databinding.ADBBea
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSubnetResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSubnetResponse").equals(reader.getName())) {
object.setCreateSubnetResponse(com.amazon.ec2.CreateSubnetResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java b/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java
index a68e735..b8f8ab0 100644
--- a/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java
@@ -125,7 +125,8 @@ public class CreateSubnetResponseType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class CreateSubnetResponseType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateSubnetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateSubnetType.java b/awsapi/src/com/amazon/ec2/CreateSubnetType.java
index c1c4710..a4a6846 100644
--- a/awsapi/src/com/amazon/ec2/CreateSubnetType.java
+++ b/awsapi/src/com/amazon/ec2/CreateSubnetType.java
@@ -163,7 +163,8 @@ public class CreateSubnetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -308,9 +309,8 @@ public class CreateSubnetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateTags.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateTags.java b/awsapi/src/com/amazon/ec2/CreateTags.java
index 114b07d..b8a407d 100644
--- a/awsapi/src/com/amazon/ec2/CreateTags.java
+++ b/awsapi/src/com/amazon/ec2/CreateTags.java
@@ -98,7 +98,8 @@ public class CreateTags implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateTags implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateTagsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateTagsResponse.java b/awsapi/src/com/amazon/ec2/CreateTagsResponse.java
index b8f3aa3..401299f 100644
--- a/awsapi/src/com/amazon/ec2/CreateTagsResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateTagsResponse.java
@@ -98,7 +98,8 @@ public class CreateTagsResponse implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateTagsResponse implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateTagsResponse implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateTagsResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateTagsResponse").equals(reader.getName())) {
object.setCreateTagsResponse(com.amazon.ec2.CreateTagsResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java b/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java
index 2d0b717..d804840 100644
--- a/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java
@@ -125,7 +125,8 @@ public class CreateTagsResponseType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class CreateTagsResponseType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateTagsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateTagsType.java b/awsapi/src/com/amazon/ec2/CreateTagsType.java
index f0e4f4d..df47acf 100644
--- a/awsapi/src/com/amazon/ec2/CreateTagsType.java
+++ b/awsapi/src/com/amazon/ec2/CreateTagsType.java
@@ -125,7 +125,8 @@ public class CreateTagsType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -184,9 +185,8 @@ public class CreateTagsType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVolume.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolume.java b/awsapi/src/com/amazon/ec2/CreateVolume.java
index e49be11..a1632f0 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolume.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolume.java
@@ -98,7 +98,8 @@ public class CreateVolume implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateVolume implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java b/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java
index 25a3a85..6b634ed 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java
@@ -168,7 +168,8 @@ public class CreateVolumePermissionItemType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -282,9 +283,8 @@ public class CreateVolumePermissionItemType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java b/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java
index 7fc98d9..0ad6fa3 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java
@@ -142,7 +142,8 @@ public class CreateVolumePermissionListType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class CreateVolumePermissionListType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java b/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java
index 7729f04..a21105c 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java
@@ -168,7 +168,8 @@ public class CreateVolumePermissionOperationType implements org.apache.axis2.dat
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -228,9 +229,8 @@ public class CreateVolumePermissionOperationType implements org.apache.axis2.dat
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java b/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java
index d999409..530491a 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java
@@ -98,7 +98,8 @@ public class CreateVolumeResponse implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateVolumeResponse implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateVolumeResponse implements org.apache.axis2.databinding.ADBBea
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVolumeResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVolumeResponse").equals(reader.getName())) {
object.setCreateVolumeResponse(com.amazon.ec2.CreateVolumeResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java b/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java
index d340ac5..4663ef4 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java
@@ -308,7 +308,8 @@ public class CreateVolumeResponseType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -642,9 +643,8 @@ public class CreateVolumeResponseType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVolumeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVolumeType.java b/awsapi/src/com/amazon/ec2/CreateVolumeType.java
index 82a2f59..7722a69 100644
--- a/awsapi/src/com/amazon/ec2/CreateVolumeType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVolumeType.java
@@ -254,7 +254,8 @@ public class CreateVolumeType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -462,9 +463,8 @@ public class CreateVolumeType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVpc.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpc.java b/awsapi/src/com/amazon/ec2/CreateVpc.java
index e38dedc..8531307 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpc.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpc.java
@@ -98,7 +98,8 @@ public class CreateVpc implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateVpc implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVpcResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpcResponse.java b/awsapi/src/com/amazon/ec2/CreateVpcResponse.java
index 216f4a3..1172fdb 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpcResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpcResponse.java
@@ -98,7 +98,8 @@ public class CreateVpcResponse implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateVpcResponse implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateVpcResponse implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpcResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpcResponse").equals(reader.getName())) {
object.setCreateVpcResponse(com.amazon.ec2.CreateVpcResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVpcResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpcResponseType.java b/awsapi/src/com/amazon/ec2/CreateVpcResponseType.java
index 44d4e68..74750ce 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpcResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpcResponseType.java
@@ -125,7 +125,8 @@ public class CreateVpcResponseType implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class CreateVpcResponseType implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVpcType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpcType.java b/awsapi/src/com/amazon/ec2/CreateVpcType.java
index 59dca85..216826a 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpcType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpcType.java
@@ -139,7 +139,8 @@ public class CreateVpcType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -252,9 +253,8 @@ public class CreateVpcType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVpnConnection.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnection.java b/awsapi/src/com/amazon/ec2/CreateVpnConnection.java
index a3d2024..0c817d0 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnection.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnection.java
@@ -98,7 +98,8 @@ public class CreateVpnConnection implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateVpnConnection implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateVpnConnection implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnConnection").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnConnection").equals(reader.getName())) {
object.setCreateVpnConnection(com.amazon.ec2.CreateVpnConnectionType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponse.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponse.java
index 6aa73e3..23c4ecd 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class CreateVpnConnectionResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnConnectionResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnConnectionResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class CreateVpnConnectionResponse implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class CreateVpnConnectionResponse implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponseType.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponseType.java
index 6ec847f..08c4d51 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponseType.java
@@ -125,7 +125,8 @@ public class CreateVpnConnectionResponseType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class CreateVpnConnectionResponseType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRoute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRoute.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRoute.java
index f01afa3..42706cd 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRoute.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRoute.java
@@ -98,7 +98,8 @@ public class CreateVpnConnectionRoute implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateVpnConnectionRoute implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponse.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponse.java
index 310bf88..64cadc9 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class CreateVpnConnectionRouteResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnConnectionRouteResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "CreateVpnConnectionRouteResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class CreateVpnConnectionRouteResponse implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class CreateVpnConnectionRouteResponse implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponseType.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponseType.java
index 19c0a7d..ee43fb1 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponseType.java
@@ -125,7 +125,8 @@ public class CreateVpnConnectionRouteResponseType implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class CreateVpnConnectionRouteResponseType implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteType.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteType.java
index bd52b13..077e54e 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteType.java
@@ -125,7 +125,8 @@ public class CreateVpnConnectionRouteType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class CreateVpnConnectionRouteType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVpnConnectionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionType.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionType.java
index 586d354..3739797 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionType.java
@@ -187,7 +187,8 @@ public class CreateVpnConnectionType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -337,9 +338,8 @@ public class CreateVpnConnectionType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVpnGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnGateway.java b/awsapi/src/com/amazon/ec2/CreateVpnGateway.java
index 29a3288..0cf847d 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnGateway.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnGateway.java
@@ -98,7 +98,8 @@ public class CreateVpnGateway implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateVpnGateway implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateVpnGateway implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnGateway").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnGateway").equals(reader.getName())) {
object.setCreateVpnGateway(com.amazon.ec2.CreateVpnGatewayType.Factory.parse(reader));
[16/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RunningInstancesItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RunningInstancesItemType.java b/awsapi/src/com/amazon/ec2/RunningInstancesItemType.java
index edb9783..6ed0b47 100644
--- a/awsapi/src/com/amazon/ec2/RunningInstancesItemType.java
+++ b/awsapi/src/com/amazon/ec2/RunningInstancesItemType.java
@@ -1401,7 +1401,8 @@ public class RunningInstancesItemType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -2358,9 +2359,8 @@ public class RunningInstancesItemType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -3332,7 +3332,8 @@ public class RunningInstancesItemType implements org.apache.axis2.databinding.AD
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RunningInstancesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RunningInstancesSetType.java b/awsapi/src/com/amazon/ec2/RunningInstancesSetType.java
index 892c49e..1f4009e 100644
--- a/awsapi/src/com/amazon/ec2/RunningInstancesSetType.java
+++ b/awsapi/src/com/amazon/ec2/RunningInstancesSetType.java
@@ -129,7 +129,8 @@ public class RunningInstancesSetType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -195,9 +196,8 @@ public class RunningInstancesSetType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/SecurityGroupIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SecurityGroupIdSetItemType.java b/awsapi/src/com/amazon/ec2/SecurityGroupIdSetItemType.java
index 1c6d01a..95a3fb1 100644
--- a/awsapi/src/com/amazon/ec2/SecurityGroupIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/SecurityGroupIdSetItemType.java
@@ -101,7 +101,8 @@ public class SecurityGroupIdSetItemType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class SecurityGroupIdSetItemType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/SecurityGroupIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SecurityGroupIdSetType.java b/awsapi/src/com/amazon/ec2/SecurityGroupIdSetType.java
index 698306e..f55b404 100644
--- a/awsapi/src/com/amazon/ec2/SecurityGroupIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/SecurityGroupIdSetType.java
@@ -142,7 +142,8 @@ public class SecurityGroupIdSetType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class SecurityGroupIdSetType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/SecurityGroupItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SecurityGroupItemType.java b/awsapi/src/com/amazon/ec2/SecurityGroupItemType.java
index c671c3d..5ec01bd 100644
--- a/awsapi/src/com/amazon/ec2/SecurityGroupItemType.java
+++ b/awsapi/src/com/amazon/ec2/SecurityGroupItemType.java
@@ -311,7 +311,8 @@ public class SecurityGroupItemType implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -536,9 +537,8 @@ public class SecurityGroupItemType implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/SecurityGroupSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SecurityGroupSetType.java b/awsapi/src/com/amazon/ec2/SecurityGroupSetType.java
index 70b2e9e..f94d1b8 100644
--- a/awsapi/src/com/amazon/ec2/SecurityGroupSetType.java
+++ b/awsapi/src/com/amazon/ec2/SecurityGroupSetType.java
@@ -142,7 +142,8 @@ public class SecurityGroupSetType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class SecurityGroupSetType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/SpotDatafeedSubscriptionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SpotDatafeedSubscriptionType.java b/awsapi/src/com/amazon/ec2/SpotDatafeedSubscriptionType.java
index 53f2fab..fd77b0f 100644
--- a/awsapi/src/com/amazon/ec2/SpotDatafeedSubscriptionType.java
+++ b/awsapi/src/com/amazon/ec2/SpotDatafeedSubscriptionType.java
@@ -211,7 +211,8 @@ public class SpotDatafeedSubscriptionType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -393,9 +394,8 @@ public class SpotDatafeedSubscriptionType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetItemType.java b/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetItemType.java
index 35ea927..f05ac51 100644
--- a/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetItemType.java
@@ -101,7 +101,8 @@ public class SpotInstanceRequestIdSetItemType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class SpotInstanceRequestIdSetItemType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -391,7 +391,8 @@ public class SpotInstanceRequestIdSetItemType implements org.apache.axis2.databi
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetType.java b/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetType.java
index 23b721f..4f3d472 100644
--- a/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetType.java
@@ -142,7 +142,8 @@ public class SpotInstanceRequestIdSetType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class SpotInstanceRequestIdSetType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetItemType.java b/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetItemType.java
index 26e6766..ad5d5ba 100644
--- a/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetItemType.java
@@ -591,7 +591,8 @@ public class SpotInstanceRequestSetItemType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -1049,9 +1050,8 @@ public class SpotInstanceRequestSetItemType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -1378,7 +1378,8 @@ public class SpotInstanceRequestSetItemType implements org.apache.axis2.databind
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
@@ -1516,7 +1517,8 @@ public class SpotInstanceRequestSetItemType implements org.apache.axis2.databind
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availabilityZoneGroup").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availabilityZoneGroup").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
@@ -1614,7 +1616,8 @@ public class SpotInstanceRequestSetItemType implements org.apache.axis2.databind
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "launchedAvailabilityZone").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "launchedAvailabilityZone").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetType.java b/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetType.java
index f1294b9..26c6a3b 100644
--- a/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetType.java
+++ b/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetType.java
@@ -142,7 +142,8 @@ public class SpotInstanceRequestSetType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class SpotInstanceRequestSetType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/SpotInstanceStateFaultType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SpotInstanceStateFaultType.java b/awsapi/src/com/amazon/ec2/SpotInstanceStateFaultType.java
index 3155641..19b8876 100644
--- a/awsapi/src/com/amazon/ec2/SpotInstanceStateFaultType.java
+++ b/awsapi/src/com/amazon/ec2/SpotInstanceStateFaultType.java
@@ -125,7 +125,8 @@ public class SpotInstanceStateFaultType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class SpotInstanceStateFaultType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/SpotPlacementRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SpotPlacementRequestType.java b/awsapi/src/com/amazon/ec2/SpotPlacementRequestType.java
index 2603cb3..9ce9866 100644
--- a/awsapi/src/com/amazon/ec2/SpotPlacementRequestType.java
+++ b/awsapi/src/com/amazon/ec2/SpotPlacementRequestType.java
@@ -153,7 +153,8 @@ public class SpotPlacementRequestType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -267,9 +268,8 @@ public class SpotPlacementRequestType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/SpotPriceHistorySetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SpotPriceHistorySetItemType.java b/awsapi/src/com/amazon/ec2/SpotPriceHistorySetItemType.java
index 5cd0bdd..2c9950e 100644
--- a/awsapi/src/com/amazon/ec2/SpotPriceHistorySetItemType.java
+++ b/awsapi/src/com/amazon/ec2/SpotPriceHistorySetItemType.java
@@ -211,7 +211,8 @@ public class SpotPriceHistorySetItemType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -420,9 +421,8 @@ public class SpotPriceHistorySetItemType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/SpotPriceHistorySetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SpotPriceHistorySetType.java b/awsapi/src/com/amazon/ec2/SpotPriceHistorySetType.java
index 855fd1b..21c2264 100644
--- a/awsapi/src/com/amazon/ec2/SpotPriceHistorySetType.java
+++ b/awsapi/src/com/amazon/ec2/SpotPriceHistorySetType.java
@@ -142,7 +142,8 @@ public class SpotPriceHistorySetType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class SpotPriceHistorySetType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/StartInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/StartInstances.java b/awsapi/src/com/amazon/ec2/StartInstances.java
index eb5dd98..1eb4bcc 100644
--- a/awsapi/src/com/amazon/ec2/StartInstances.java
+++ b/awsapi/src/com/amazon/ec2/StartInstances.java
@@ -98,7 +98,8 @@ public class StartInstances implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class StartInstances implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class StartInstances implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StartInstances").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StartInstances").equals(reader.getName())) {
object.setStartInstances(com.amazon.ec2.StartInstancesType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/StartInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/StartInstancesResponse.java b/awsapi/src/com/amazon/ec2/StartInstancesResponse.java
index 086566a..ef93290 100644
--- a/awsapi/src/com/amazon/ec2/StartInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/StartInstancesResponse.java
@@ -98,7 +98,8 @@ public class StartInstancesResponse implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class StartInstancesResponse implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class StartInstancesResponse implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StartInstancesResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StartInstancesResponse").equals(reader.getName())) {
object.setStartInstancesResponse(com.amazon.ec2.StartInstancesResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/StartInstancesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/StartInstancesResponseType.java b/awsapi/src/com/amazon/ec2/StartInstancesResponseType.java
index 5ab9d24..c5747c6 100644
--- a/awsapi/src/com/amazon/ec2/StartInstancesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/StartInstancesResponseType.java
@@ -125,7 +125,8 @@ public class StartInstancesResponseType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class StartInstancesResponseType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/StartInstancesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/StartInstancesType.java b/awsapi/src/com/amazon/ec2/StartInstancesType.java
index 7512fee..2fbcecf 100644
--- a/awsapi/src/com/amazon/ec2/StartInstancesType.java
+++ b/awsapi/src/com/amazon/ec2/StartInstancesType.java
@@ -101,7 +101,8 @@ public class StartInstancesType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -155,9 +156,8 @@ public class StartInstancesType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/StateReasonType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/StateReasonType.java b/awsapi/src/com/amazon/ec2/StateReasonType.java
index 1166de9..3669c4f 100644
--- a/awsapi/src/com/amazon/ec2/StateReasonType.java
+++ b/awsapi/src/com/amazon/ec2/StateReasonType.java
@@ -125,7 +125,8 @@ public class StateReasonType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class StateReasonType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/StopInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/StopInstances.java b/awsapi/src/com/amazon/ec2/StopInstances.java
index f9b523a..d4913a9 100644
--- a/awsapi/src/com/amazon/ec2/StopInstances.java
+++ b/awsapi/src/com/amazon/ec2/StopInstances.java
@@ -98,7 +98,8 @@ public class StopInstances implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class StopInstances implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class StopInstances implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StopInstances").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StopInstances").equals(reader.getName())) {
object.setStopInstances(com.amazon.ec2.StopInstancesType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/StopInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/StopInstancesResponse.java b/awsapi/src/com/amazon/ec2/StopInstancesResponse.java
index 2b22205..cb99273 100644
--- a/awsapi/src/com/amazon/ec2/StopInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/StopInstancesResponse.java
@@ -98,7 +98,8 @@ public class StopInstancesResponse implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class StopInstancesResponse implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class StopInstancesResponse implements org.apache.axis2.databinding.ADBBe
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StopInstancesResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StopInstancesResponse").equals(reader.getName())) {
object.setStopInstancesResponse(com.amazon.ec2.StopInstancesResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/StopInstancesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/StopInstancesResponseType.java b/awsapi/src/com/amazon/ec2/StopInstancesResponseType.java
index 54cb2dd..46e3042 100644
--- a/awsapi/src/com/amazon/ec2/StopInstancesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/StopInstancesResponseType.java
@@ -125,7 +125,8 @@ public class StopInstancesResponseType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class StopInstancesResponseType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/StopInstancesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/StopInstancesType.java b/awsapi/src/com/amazon/ec2/StopInstancesType.java
index 2cd981f..1e43ee9 100644
--- a/awsapi/src/com/amazon/ec2/StopInstancesType.java
+++ b/awsapi/src/com/amazon/ec2/StopInstancesType.java
@@ -140,7 +140,8 @@ public class StopInstancesType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -223,9 +224,8 @@ public class StopInstancesType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/SubnetIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SubnetIdSetItemType.java b/awsapi/src/com/amazon/ec2/SubnetIdSetItemType.java
index 0d46f5b..b54a291 100644
--- a/awsapi/src/com/amazon/ec2/SubnetIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/SubnetIdSetItemType.java
@@ -101,7 +101,8 @@ public class SubnetIdSetItemType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class SubnetIdSetItemType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/SubnetIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SubnetIdSetType.java b/awsapi/src/com/amazon/ec2/SubnetIdSetType.java
index b55b315..e21f2fd 100644
--- a/awsapi/src/com/amazon/ec2/SubnetIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/SubnetIdSetType.java
@@ -142,7 +142,8 @@ public class SubnetIdSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class SubnetIdSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,8 +463,8 @@ public class SubnetIdSetType implements org.apache.axis2.databinding.ADBBean {
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.SubnetIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.SubnetIdSetItemType.class,
- list1));
+ object.setItem((com.amazon.ec2.SubnetIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+ com.amazon.ec2.SubnetIdSetItemType.class, list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/SubnetSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SubnetSetType.java b/awsapi/src/com/amazon/ec2/SubnetSetType.java
index daa52ef..2e1576f 100644
--- a/awsapi/src/com/amazon/ec2/SubnetSetType.java
+++ b/awsapi/src/com/amazon/ec2/SubnetSetType.java
@@ -142,7 +142,8 @@ public class SubnetSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class SubnetSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/SubnetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/SubnetType.java b/awsapi/src/com/amazon/ec2/SubnetType.java
index 33dab24..42c5ada 100644
--- a/awsapi/src/com/amazon/ec2/SubnetType.java
+++ b/awsapi/src/com/amazon/ec2/SubnetType.java
@@ -330,7 +330,8 @@ public class SubnetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -578,9 +579,8 @@ public class SubnetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -905,7 +905,8 @@ public class SubnetType implements org.apache.axis2.databinding.ADBBean {
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availableIpAddressCount").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availableIpAddressCount").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/TagSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/TagSetItemType.java b/awsapi/src/com/amazon/ec2/TagSetItemType.java
index 43aaa17..eb2d927 100644
--- a/awsapi/src/com/amazon/ec2/TagSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/TagSetItemType.java
@@ -229,7 +229,8 @@ public class TagSetItemType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -409,9 +410,8 @@ public class TagSetItemType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/TagSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/TagSetType.java b/awsapi/src/com/amazon/ec2/TagSetType.java
index 8fb6f48..cd49512 100644
--- a/awsapi/src/com/amazon/ec2/TagSetType.java
+++ b/awsapi/src/com/amazon/ec2/TagSetType.java
@@ -142,7 +142,8 @@ public class TagSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class TagSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,7 +463,8 @@ public class TagSetType implements org.apache.axis2.databinding.ADBBean {
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.TagSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.TagSetItemType.class, list1));
+ object.setItem((com.amazon.ec2.TagSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.TagSetItemType.class,
+ list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/TerminateInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/TerminateInstances.java b/awsapi/src/com/amazon/ec2/TerminateInstances.java
index 97da176..cf5ec5c 100644
--- a/awsapi/src/com/amazon/ec2/TerminateInstances.java
+++ b/awsapi/src/com/amazon/ec2/TerminateInstances.java
@@ -98,7 +98,8 @@ public class TerminateInstances implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class TerminateInstances implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class TerminateInstances implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "TerminateInstances").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "TerminateInstances").equals(reader.getName())) {
object.setTerminateInstances(com.amazon.ec2.TerminateInstancesType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/TerminateInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/TerminateInstancesResponse.java b/awsapi/src/com/amazon/ec2/TerminateInstancesResponse.java
index 5ecf983..72d33e6 100644
--- a/awsapi/src/com/amazon/ec2/TerminateInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/TerminateInstancesResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class TerminateInstancesResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "TerminateInstancesResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "TerminateInstancesResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class TerminateInstancesResponse implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class TerminateInstancesResponse implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/TerminateInstancesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/TerminateInstancesResponseType.java b/awsapi/src/com/amazon/ec2/TerminateInstancesResponseType.java
index b8d6c86..8613d72 100644
--- a/awsapi/src/com/amazon/ec2/TerminateInstancesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/TerminateInstancesResponseType.java
@@ -125,7 +125,8 @@ public class TerminateInstancesResponseType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class TerminateInstancesResponseType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/TerminateInstancesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/TerminateInstancesType.java b/awsapi/src/com/amazon/ec2/TerminateInstancesType.java
index 5cffebc..a0fe0a5 100644
--- a/awsapi/src/com/amazon/ec2/TerminateInstancesType.java
+++ b/awsapi/src/com/amazon/ec2/TerminateInstancesType.java
@@ -101,7 +101,8 @@ public class TerminateInstancesType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -155,9 +156,8 @@ public class TerminateInstancesType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddresses.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddresses.java b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddresses.java
index a3b2075..d59f105 100644
--- a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddresses.java
+++ b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddresses.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class UnassignPrivateIpAddresses implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnassignPrivateIpAddresses", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnassignPrivateIpAddresses",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class UnassignPrivateIpAddresses implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class UnassignPrivateIpAddresses implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponse.java b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponse.java
index ad2dae4..3e22399 100644
--- a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponse.java
+++ b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class UnassignPrivateIpAddressesResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnassignPrivateIpAddressesResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "UnassignPrivateIpAddressesResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class UnassignPrivateIpAddressesResponse implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class UnassignPrivateIpAddressesResponse implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponseType.java b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponseType.java
index e37c9b9..07d21d2 100644
--- a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponseType.java
@@ -125,7 +125,8 @@ public class UnassignPrivateIpAddressesResponseType implements org.apache.axis2.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class UnassignPrivateIpAddressesResponseType implements org.apache.axis2.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesType.java b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesType.java
index 7fc066b..7c3da64 100644
--- a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesType.java
+++ b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesType.java
@@ -125,7 +125,8 @@ public class UnassignPrivateIpAddressesType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class UnassignPrivateIpAddressesType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -445,7 +445,8 @@ public class UnassignPrivateIpAddressesType implements org.apache.axis2.databind
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) {
object.setPrivateIpAddressesSet(com.amazon.ec2.AssignPrivateIpAddressesSetRequestType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/UnmonitorInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/UnmonitorInstances.java b/awsapi/src/com/amazon/ec2/UnmonitorInstances.java
index d182c81..5967bdd 100644
--- a/awsapi/src/com/amazon/ec2/UnmonitorInstances.java
+++ b/awsapi/src/com/amazon/ec2/UnmonitorInstances.java
@@ -98,7 +98,8 @@ public class UnmonitorInstances implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class UnmonitorInstances implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class UnmonitorInstances implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnmonitorInstances").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnmonitorInstances").equals(reader.getName())) {
object.setUnmonitorInstances(com.amazon.ec2.MonitorInstancesType.Factory.parse(reader));
[18/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReleaseAddressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReleaseAddressResponseType.java b/awsapi/src/com/amazon/ec2/ReleaseAddressResponseType.java
index 2f78607..683da67 100644
--- a/awsapi/src/com/amazon/ec2/ReleaseAddressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ReleaseAddressResponseType.java
@@ -125,7 +125,8 @@ public class ReleaseAddressResponseType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class ReleaseAddressResponseType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReleaseAddressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReleaseAddressType.java b/awsapi/src/com/amazon/ec2/ReleaseAddressType.java
index 62511ff..2576cdd 100644
--- a/awsapi/src/com/amazon/ec2/ReleaseAddressType.java
+++ b/awsapi/src/com/amazon/ec2/ReleaseAddressType.java
@@ -101,7 +101,8 @@ public class ReleaseAddressType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -155,9 +156,8 @@ public class ReleaseAddressType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReleaseAddressTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReleaseAddressTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ReleaseAddressTypeChoice_type0.java
index eca6c31..91edd24 100644
--- a/awsapi/src/com/amazon/ec2/ReleaseAddressTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/ReleaseAddressTypeChoice_type0.java
@@ -168,7 +168,8 @@ public class ReleaseAddressTypeChoice_type0 implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -261,9 +262,8 @@ public class ReleaseAddressTypeChoice_type0 implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociation.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociation.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociation.java
index cff3076..52906aa 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociation.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociation.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class ReplaceNetworkAclAssociation implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceNetworkAclAssociation", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceNetworkAclAssociation",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class ReplaceNetworkAclAssociation implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class ReplaceNetworkAclAssociation implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponse.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponse.java
index 0ad992c..c688c9a 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponse.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponse.java
@@ -30,8 +30,8 @@ package com.amazon.ec2;
public class ReplaceNetworkAclAssociationResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceNetworkAclAssociationResponse",
- "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "ReplaceNetworkAclAssociationResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -99,7 +99,8 @@ public class ReplaceNetworkAclAssociationResponse implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -119,9 +120,8 @@ public class ReplaceNetworkAclAssociationResponse implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponseType.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponseType.java
index 99bb882..cf7f6b9 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponseType.java
@@ -125,7 +125,8 @@ public class ReplaceNetworkAclAssociationResponseType implements org.apache.axis
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class ReplaceNetworkAclAssociationResponseType implements org.apache.axis
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationType.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationType.java
index 5d89632..3d1a26a 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationType.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationType.java
@@ -125,7 +125,8 @@ public class ReplaceNetworkAclAssociationType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class ReplaceNetworkAclAssociationType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntry.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntry.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntry.java
index aae8849..5bd77c3 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntry.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntry.java
@@ -98,7 +98,8 @@ public class ReplaceNetworkAclEntry implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ReplaceNetworkAclEntry implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class ReplaceNetworkAclEntry implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceNetworkAclEntry").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceNetworkAclEntry").equals(reader.getName())) {
object.setReplaceNetworkAclEntry(com.amazon.ec2.ReplaceNetworkAclEntryType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponse.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponse.java
index 1abb802..8cfc393 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponse.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class ReplaceNetworkAclEntryResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceNetworkAclEntryResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceNetworkAclEntryResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class ReplaceNetworkAclEntryResponse implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class ReplaceNetworkAclEntryResponse implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponseType.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponseType.java
index 78d31e4..49a00a2 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponseType.java
@@ -125,7 +125,8 @@ public class ReplaceNetworkAclEntryResponseType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class ReplaceNetworkAclEntryResponseType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryType.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryType.java
index 3a553e1..76df8b0 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryType.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryType.java
@@ -297,7 +297,8 @@ public class ReplaceNetworkAclEntryType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -543,9 +544,8 @@ public class ReplaceNetworkAclEntryType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReplaceRoute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceRoute.java b/awsapi/src/com/amazon/ec2/ReplaceRoute.java
index cd189a9..c05e298 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceRoute.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceRoute.java
@@ -98,7 +98,8 @@ public class ReplaceRoute implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ReplaceRoute implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReplaceRouteResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteResponse.java b/awsapi/src/com/amazon/ec2/ReplaceRouteResponse.java
index b352570..4874a8d 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceRouteResponse.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceRouteResponse.java
@@ -98,7 +98,8 @@ public class ReplaceRouteResponse implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ReplaceRouteResponse implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class ReplaceRouteResponse implements org.apache.axis2.databinding.ADBBea
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceRouteResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceRouteResponse").equals(reader.getName())) {
object.setReplaceRouteResponse(com.amazon.ec2.ReplaceRouteResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReplaceRouteResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteResponseType.java b/awsapi/src/com/amazon/ec2/ReplaceRouteResponseType.java
index e5d0fa1..ecddad2 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceRouteResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceRouteResponseType.java
@@ -125,7 +125,8 @@ public class ReplaceRouteResponseType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class ReplaceRouteResponseType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociation.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociation.java b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociation.java
index 8f61126..e932fdd 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociation.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociation.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class ReplaceRouteTableAssociation implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceRouteTableAssociation", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceRouteTableAssociation",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class ReplaceRouteTableAssociation implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class ReplaceRouteTableAssociation implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponse.java b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponse.java
index ebe5644..02d455f 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponse.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponse.java
@@ -30,8 +30,8 @@ package com.amazon.ec2;
public class ReplaceRouteTableAssociationResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceRouteTableAssociationResponse",
- "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "ReplaceRouteTableAssociationResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -99,7 +99,8 @@ public class ReplaceRouteTableAssociationResponse implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -119,9 +120,8 @@ public class ReplaceRouteTableAssociationResponse implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponseType.java b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponseType.java
index b18b221..d93bd10 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponseType.java
@@ -125,7 +125,8 @@ public class ReplaceRouteTableAssociationResponseType implements org.apache.axis
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class ReplaceRouteTableAssociationResponseType implements org.apache.axis
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationType.java b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationType.java
index e2e005b..b406312 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationType.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationType.java
@@ -125,7 +125,8 @@ public class ReplaceRouteTableAssociationType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class ReplaceRouteTableAssociationType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReplaceRouteType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteType.java b/awsapi/src/com/amazon/ec2/ReplaceRouteType.java
index 3e4c314..086b7f1 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceRouteType.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceRouteType.java
@@ -149,7 +149,8 @@ public class ReplaceRouteType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -267,9 +268,8 @@ public class ReplaceRouteType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReplaceRouteTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ReplaceRouteTypeChoice_type0.java
index cfaf6aa..aced731 100644
--- a/awsapi/src/com/amazon/ec2/ReplaceRouteTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/ReplaceRouteTypeChoice_type0.java
@@ -210,7 +210,8 @@ public class ReplaceRouteTypeChoice_type0 implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -336,9 +337,8 @@ public class ReplaceRouteTypeChoice_type0 implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReportInstanceStatus.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReportInstanceStatus.java b/awsapi/src/com/amazon/ec2/ReportInstanceStatus.java
index 1df861b..e2f858c 100644
--- a/awsapi/src/com/amazon/ec2/ReportInstanceStatus.java
+++ b/awsapi/src/com/amazon/ec2/ReportInstanceStatus.java
@@ -98,7 +98,8 @@ public class ReportInstanceStatus implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ReportInstanceStatus implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class ReportInstanceStatus implements org.apache.axis2.databinding.ADBBea
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReportInstanceStatus").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReportInstanceStatus").equals(reader.getName())) {
object.setReportInstanceStatus(com.amazon.ec2.ReportInstanceStatusType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodeSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodeSetItemType.java b/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodeSetItemType.java
index 05aaaf5..cdf8dad 100644
--- a/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodeSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodeSetItemType.java
@@ -101,7 +101,8 @@ public class ReportInstanceStatusReasonCodeSetItemType implements org.apache.axi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class ReportInstanceStatusReasonCodeSetItemType implements org.apache.axi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodesSetType.java b/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodesSetType.java
index 982a00f..0e68860 100644
--- a/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodesSetType.java
+++ b/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodesSetType.java
@@ -90,7 +90,8 @@ public class ReportInstanceStatusReasonCodesSetType implements org.apache.axis2.
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem);
list.add(param);
- this.localItem = (com.amazon.ec2.ReportInstanceStatusReasonCodeSetItemType[])list.toArray(new com.amazon.ec2.ReportInstanceStatusReasonCodeSetItemType[list.size()]);
+ this.localItem =
+ (com.amazon.ec2.ReportInstanceStatusReasonCodeSetItemType[])list.toArray(new com.amazon.ec2.ReportInstanceStatusReasonCodeSetItemType[list.size()]);
}
@@ -129,7 +130,8 @@ public class ReportInstanceStatusReasonCodesSetType implements org.apache.axis2.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -195,9 +197,8 @@ public class ReportInstanceStatusReasonCodesSetType implements org.apache.axis2.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponse.java b/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponse.java
index 73016fe..cc6ce8c 100644
--- a/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponse.java
+++ b/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class ReportInstanceStatusResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReportInstanceStatusResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReportInstanceStatusResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class ReportInstanceStatusResponse implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class ReportInstanceStatusResponse implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponseType.java b/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponseType.java
index c4d3a5b..d7f3304 100644
--- a/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponseType.java
@@ -125,7 +125,8 @@ public class ReportInstanceStatusResponseType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class ReportInstanceStatusResponseType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReportInstanceStatusType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReportInstanceStatusType.java b/awsapi/src/com/amazon/ec2/ReportInstanceStatusType.java
index 95ed41f..3390ff4 100644
--- a/awsapi/src/com/amazon/ec2/ReportInstanceStatusType.java
+++ b/awsapi/src/com/amazon/ec2/ReportInstanceStatusType.java
@@ -263,7 +263,8 @@ public class ReportInstanceStatusType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -451,9 +452,8 @@ public class ReportInstanceStatusType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RequestSpotInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RequestSpotInstances.java b/awsapi/src/com/amazon/ec2/RequestSpotInstances.java
index 1b7c455..4829fc1 100644
--- a/awsapi/src/com/amazon/ec2/RequestSpotInstances.java
+++ b/awsapi/src/com/amazon/ec2/RequestSpotInstances.java
@@ -98,7 +98,8 @@ public class RequestSpotInstances implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class RequestSpotInstances implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class RequestSpotInstances implements org.apache.axis2.databinding.ADBBea
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RequestSpotInstances").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RequestSpotInstances").equals(reader.getName())) {
object.setRequestSpotInstances(com.amazon.ec2.RequestSpotInstancesType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponse.java b/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponse.java
index 84f436b..4ba16c9 100644
--- a/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class RequestSpotInstancesResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RequestSpotInstancesResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RequestSpotInstancesResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class RequestSpotInstancesResponse implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class RequestSpotInstancesResponse implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponseType.java b/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponseType.java
index 26abf4a..0166ad2 100644
--- a/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponseType.java
@@ -125,7 +125,8 @@ public class RequestSpotInstancesResponseType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class RequestSpotInstancesResponseType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -445,7 +445,8 @@ public class RequestSpotInstancesResponseType implements org.apache.axis2.databi
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestSet").equals(reader.getName())) {
object.setSpotInstanceRequestSet(com.amazon.ec2.SpotInstanceRequestSetType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RequestSpotInstancesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RequestSpotInstancesType.java b/awsapi/src/com/amazon/ec2/RequestSpotInstancesType.java
index abebc6f..a44ea6e 100644
--- a/awsapi/src/com/amazon/ec2/RequestSpotInstancesType.java
+++ b/awsapi/src/com/amazon/ec2/RequestSpotInstancesType.java
@@ -353,7 +353,8 @@ public class RequestSpotInstancesType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -636,9 +637,8 @@ public class RequestSpotInstancesType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -1008,7 +1008,8 @@ public class RequestSpotInstancesType implements org.apache.axis2.databinding.AD
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availabilityZoneGroup").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availabilityZoneGroup").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReservationInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReservationInfoType.java b/awsapi/src/com/amazon/ec2/ReservationInfoType.java
index 6536d9f..9a01ed1 100644
--- a/awsapi/src/com/amazon/ec2/ReservationInfoType.java
+++ b/awsapi/src/com/amazon/ec2/ReservationInfoType.java
@@ -211,7 +211,8 @@ public class ReservationInfoType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -366,9 +367,8 @@ public class ReservationInfoType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReservationSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReservationSetType.java b/awsapi/src/com/amazon/ec2/ReservationSetType.java
index 2088981..2410160 100644
--- a/awsapi/src/com/amazon/ec2/ReservationSetType.java
+++ b/awsapi/src/com/amazon/ec2/ReservationSetType.java
@@ -142,7 +142,8 @@ public class ReservationSetType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class ReservationSetType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,8 +463,8 @@ public class ReservationSetType implements org.apache.axis2.databinding.ADBBean
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.ReservationInfoType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.ReservationInfoType.class,
- list1));
+ object.setItem((com.amazon.ec2.ReservationInfoType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+ com.amazon.ec2.ReservationInfoType.class, list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ReservedInstanceLimitPriceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ReservedInstanceLimitPriceType.java b/awsapi/src/com/amazon/ec2/ReservedInstanceLimitPriceType.java
index d9e0b4b..20da1a7 100644
--- a/awsapi/src/com/amazon/ec2/ReservedInstanceLimitPriceType.java
+++ b/awsapi/src/com/amazon/ec2/ReservedInstanceLimitPriceType.java
@@ -139,7 +139,8 @@ public class ReservedInstanceLimitPriceType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -249,9 +250,8 @@ public class ReservedInstanceLimitPriceType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetImageAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetImageAttribute.java b/awsapi/src/com/amazon/ec2/ResetImageAttribute.java
index bad871f..bf1ab67 100644
--- a/awsapi/src/com/amazon/ec2/ResetImageAttribute.java
+++ b/awsapi/src/com/amazon/ec2/ResetImageAttribute.java
@@ -98,7 +98,8 @@ public class ResetImageAttribute implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ResetImageAttribute implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class ResetImageAttribute implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetImageAttribute").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetImageAttribute").equals(reader.getName())) {
object.setResetImageAttribute(com.amazon.ec2.ResetImageAttributeType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetImageAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetImageAttributeResponse.java b/awsapi/src/com/amazon/ec2/ResetImageAttributeResponse.java
index b54636e..fc816e8 100644
--- a/awsapi/src/com/amazon/ec2/ResetImageAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ResetImageAttributeResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class ResetImageAttributeResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetImageAttributeResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetImageAttributeResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class ResetImageAttributeResponse implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class ResetImageAttributeResponse implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetImageAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetImageAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ResetImageAttributeResponseType.java
index 7618c48..56533b7 100644
--- a/awsapi/src/com/amazon/ec2/ResetImageAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ResetImageAttributeResponseType.java
@@ -125,7 +125,8 @@ public class ResetImageAttributeResponseType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class ResetImageAttributeResponseType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetImageAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetImageAttributeType.java b/awsapi/src/com/amazon/ec2/ResetImageAttributeType.java
index 87e57ec..730aebf 100644
--- a/awsapi/src/com/amazon/ec2/ResetImageAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/ResetImageAttributeType.java
@@ -125,7 +125,8 @@ public class ResetImageAttributeType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class ResetImageAttributeType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetImageAttributesGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetImageAttributesGroup.java b/awsapi/src/com/amazon/ec2/ResetImageAttributesGroup.java
index c1f9345..a23668f 100644
--- a/awsapi/src/com/amazon/ec2/ResetImageAttributesGroup.java
+++ b/awsapi/src/com/amazon/ec2/ResetImageAttributesGroup.java
@@ -126,7 +126,8 @@ public class ResetImageAttributesGroup implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -159,9 +160,8 @@ public class ResetImageAttributesGroup implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetInstanceAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetInstanceAttribute.java b/awsapi/src/com/amazon/ec2/ResetInstanceAttribute.java
index 16bb53e..df05275 100644
--- a/awsapi/src/com/amazon/ec2/ResetInstanceAttribute.java
+++ b/awsapi/src/com/amazon/ec2/ResetInstanceAttribute.java
@@ -98,7 +98,8 @@ public class ResetInstanceAttribute implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ResetInstanceAttribute implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class ResetInstanceAttribute implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetInstanceAttribute").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetInstanceAttribute").equals(reader.getName())) {
object.setResetInstanceAttribute(com.amazon.ec2.ResetInstanceAttributeType.Factory.parse(reader));
[45/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java
index f596ee9..91adeb1 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -30,8 +32,6 @@ import org.apache.cloudstack.api.response.AutoScalePolicyResponse;
import org.apache.cloudstack.api.response.ConditionResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScalePolicy;
import com.cloud.user.Account;
@@ -61,7 +61,11 @@ public class UpdateAutoScalePolicyCmd extends BaseAsyncCmd {
description = "the list of IDs of the conditions that are being evaluated on every interval")
private List<Long> conditionIds;
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = AutoScalePolicyResponse.class, required = true, description = "the ID of the autoscale policy")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = AutoScalePolicyResponse.class,
+ required = true,
+ description = "the ID of the autoscale policy")
private Long id;
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java
index c2a5303..dbbd85f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -30,8 +32,6 @@ import org.apache.cloudstack.api.response.AutoScalePolicyResponse;
import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScaleVmGroup;
import com.cloud.user.Account;
@@ -73,7 +73,11 @@ public class UpdateAutoScaleVmGroupCmd extends BaseAsyncCmd {
description = "list of scaledown autoscale policies")
private List<Long> scaleDownPolicyIds;
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = AutoScaleVmGroupResponse.class, required = true, description = "the ID of the autoscale group")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = AutoScaleVmGroupResponse.class,
+ required = true,
+ description = "the ID of the autoscale group")
private Long id;
// ///////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
index a08e073..f3361d8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -31,8 +33,6 @@ import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.UserResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScaleVmProfile;
import com.cloud.user.Account;
@@ -47,10 +47,17 @@ public class UpdateAutoScaleVmProfileCmd extends BaseAsyncCmd {
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = AutoScaleVmProfileResponse.class, required = true, description = "the ID of the autoscale vm profile")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = AutoScaleVmProfileResponse.class,
+ required = true,
+ description = "the ID of the autoscale vm profile")
private Long id;
- @Parameter(name = ApiConstants.TEMPLATE_ID, type = CommandType.UUID, entityType = TemplateResponse.class, description = "the template of the auto deployed virtual machine")
+ @Parameter(name = ApiConstants.TEMPLATE_ID,
+ type = CommandType.UUID,
+ entityType = TemplateResponse.class,
+ description = "the template of the auto deployed virtual machine")
private Long templateId;
@Parameter(name = ApiConstants.AUTOSCALE_VM_DESTROY_TIME,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java b/api/src/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java
index f3e36b4..e51f850 100644
--- a/api/src/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.event;
import java.util.Date;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -29,8 +31,6 @@ import org.apache.cloudstack.api.response.EventResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.Account;
@@ -45,17 +45,19 @@ public class ArchiveEventsCmd extends BaseCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = EventResponse.class, description = "the IDs of the events")
+ @Parameter(name = ApiConstants.IDS,
+ type = CommandType.LIST,
+ collectionType = CommandType.UUID,
+ entityType = EventResponse.class,
+ description = "the IDs of the events")
private List<Long> ids;
- @Parameter(name = ApiConstants.END_DATE,
- type = CommandType.DATE,
- description = "end date range to archive events" + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")")
+ @Parameter(name = ApiConstants.END_DATE, type = CommandType.DATE, description = "end date range to archive events"
+ + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")")
private Date endDate;
- @Parameter(name = ApiConstants.START_DATE,
- type = CommandType.DATE,
- description = "start date range to archive events" + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")")
+ @Parameter(name = ApiConstants.START_DATE, type = CommandType.DATE, description = "start date range to archive events"
+ + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")")
private Date startDate;
@Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, description = "archive by event type")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java b/api/src/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java
index a3981ec..d00b58d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.event;
import java.util.Date;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -29,8 +31,6 @@ import org.apache.cloudstack.api.response.EventResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.Account;
@@ -45,17 +45,19 @@ public class DeleteEventsCmd extends BaseCmd {
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = EventResponse.class, description = "the IDs of the events")
+ @Parameter(name = ApiConstants.IDS,
+ type = CommandType.LIST,
+ collectionType = CommandType.UUID,
+ entityType = EventResponse.class,
+ description = "the IDs of the events")
private List<Long> ids;
- @Parameter(name = ApiConstants.END_DATE,
- type = CommandType.DATE,
- description = "end date range to delete events" + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")")
+ @Parameter(name = ApiConstants.END_DATE, type = CommandType.DATE, description = "end date range to delete events"
+ + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")")
private Date endDate;
- @Parameter(name = ApiConstants.START_DATE,
- type = CommandType.DATE,
- description = "start date range to delete events" + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")")
+ @Parameter(name = ApiConstants.START_DATE, type = CommandType.DATE, description = "start date range to delete events"
+ + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")")
private Date startDate;
@Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, description = "delete by event type")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java b/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java
index 9cbc204..7a58d4c 100644
--- a/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java
@@ -18,11 +18,12 @@ package org.apache.cloudstack.api.command.user.event;
import java.util.ArrayList;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.response.EventTypeResponse;
import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
@@ -36,6 +37,7 @@ public class ListEventTypesCmd extends BaseCmd {
return s_name;
}
+ @Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java b/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java
index da37929..0e45e4e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.command.user.event;
import java.util.Date;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.EventResponse;
import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.log4j.Logger;
@APICommand(name = "listEvents", description = "A command to list events.", responseObject = EventResponse.class)
public class ListEventsCmd extends BaseListProjectAndAccountResourcesCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
index 2e0a86e..778a18b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
@@ -28,7 +28,6 @@ import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
-import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.FirewallResponse;
@@ -61,7 +60,10 @@ public class CreateEgressFirewallRuleCmd extends BaseAsyncCreateCmd implements F
description = "the network id of the port forwarding rule")
private Long networkId;
- @Parameter(name = ApiConstants.PROTOCOL, type = CommandType.STRING, required = true, description = "the protocol for the firewall rule. Valid values are TCP/UDP/ICMP.")
+ @Parameter(name = ApiConstants.PROTOCOL,
+ type = CommandType.STRING,
+ required = true,
+ description = "the protocol for the firewall rule. Valid values are TCP/UDP/ICMP.")
private String protocol;
@Parameter(name = ApiConstants.START_PORT, type = CommandType.INTEGER, description = "the starting port of firewall rule")
@@ -242,13 +244,13 @@ public class CreateEgressFirewallRuleCmd extends BaseAsyncCreateCmd implements F
if (getProtocol().equalsIgnoreCase(NetUtils.ALL_PROTO)) {
if (getSourcePortStart() != null && getSourcePortEnd() != null) {
throw new InvalidParameterValueException("Do not pass ports to protocol ALL, porotocol ALL do not require ports. Unable to create " +
- "firewall rule for the network id=" + networkId);
+ "firewall rule for the network id=" + networkId);
}
}
if (getVpcId() != null) {
throw new InvalidParameterValueException("Unable to create firewall rule for the network id=" + networkId +
- " as firewall egress rule can be created only for non vpc networks.");
+ " as firewall egress rule can be created only for non vpc networks.");
}
try {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
index 784c4be..44aa26f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.firewall;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -31,8 +33,6 @@ import org.apache.cloudstack.api.response.FirewallResponse;
import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.NetworkRuleConflictException;
@@ -59,7 +59,10 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal
description = "the IP address id of the port forwarding rule")
private Long ipAddressId;
- @Parameter(name = ApiConstants.PROTOCOL, type = CommandType.STRING, required = true, description = "the protocol for the firewall rule. Valid values are TCP/UDP/ICMP.")
+ @Parameter(name = ApiConstants.PROTOCOL,
+ type = CommandType.STRING,
+ required = true,
+ description = "the protocol for the firewall rule. Valid values are TCP/UDP/ICMP.")
private String protocol;
@Parameter(name = ApiConstants.START_PORT, type = CommandType.INTEGER, description = "the starting port of firewall rule")
@@ -93,6 +96,7 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal
return protocol.trim();
}
+ @Override
public List<String> getSourceCidrList() {
if (cidrlist != null) {
return cidrlist;
@@ -206,7 +210,7 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal
if (ntwkId == null) {
throw new InvalidParameterValueException("Unable to create firewall rule for the ipAddress id=" + ipAddressId +
- " as ip is not associated with any network and no networkId is passed in");
+ " as ip is not associated with any network and no networkId is passed in");
}
return ntwkId;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
index 73e5be2..89dc077 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.firewall;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -32,8 +34,6 @@ import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.NetworkRuleConflictException;
@@ -60,19 +60,34 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements P
description = "the IP address id of the port forwarding rule")
private Long ipAddressId;
- @Parameter(name = ApiConstants.PRIVATE_START_PORT, type = CommandType.INTEGER, required = true, description = "the starting port of port forwarding rule's private port range")
+ @Parameter(name = ApiConstants.PRIVATE_START_PORT,
+ type = CommandType.INTEGER,
+ required = true,
+ description = "the starting port of port forwarding rule's private port range")
private Integer privateStartPort;
- @Parameter(name = ApiConstants.PROTOCOL, type = CommandType.STRING, required = true, description = "the protocol for the port fowarding rule. Valid values are TCP or UDP.")
+ @Parameter(name = ApiConstants.PROTOCOL,
+ type = CommandType.STRING,
+ required = true,
+ description = "the protocol for the port fowarding rule. Valid values are TCP or UDP.")
private String protocol;
- @Parameter(name = ApiConstants.PRIVATE_END_PORT, type = CommandType.INTEGER, required = false, description = "the ending port of port forwarding rule's private port range")
+ @Parameter(name = ApiConstants.PRIVATE_END_PORT,
+ type = CommandType.INTEGER,
+ required = false,
+ description = "the ending port of port forwarding rule's private port range")
private Integer privateEndPort;
- @Parameter(name = ApiConstants.PUBLIC_START_PORT, type = CommandType.INTEGER, required = true, description = "the starting port of port forwarding rule's public port range")
+ @Parameter(name = ApiConstants.PUBLIC_START_PORT,
+ type = CommandType.INTEGER,
+ required = true,
+ description = "the starting port of port forwarding rule's public port range")
private Integer publicStartPort;
- @Parameter(name = ApiConstants.PUBLIC_END_PORT, type = CommandType.INTEGER, required = false, description = "the ending port of port forwarding rule's private port range")
+ @Parameter(name = ApiConstants.PUBLIC_END_PORT,
+ type = CommandType.INTEGER,
+ required = false,
+ description = "the ending port of port forwarding rule's private port range")
private Integer publicEndPort;
@Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
@@ -85,20 +100,21 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements P
@Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.LIST, collectionType = CommandType.STRING, description = "the cidr list to forward traffic from")
private List<String> cidrlist;
- @Parameter(name = ApiConstants.OPEN_FIREWALL,
- type = CommandType.BOOLEAN,
- description = "if true, firewall rule for source/end pubic port is automatically created; "
- + "if false - firewall rule has to be created explicitely. If not specified 1) defaulted to false when PF"
- + " rule is being created for VPC guest network 2) in all other cases defaulted to true")
+ @Parameter(name = ApiConstants.OPEN_FIREWALL, type = CommandType.BOOLEAN, description = "if true, firewall rule for source/end pubic port is automatically created; "
+ + "if false - firewall rule has to be created explicitely. If not specified 1) defaulted to false when PF"
+ + " rule is being created for VPC guest network 2) in all other cases defaulted to true")
private Boolean openFirewall;
@Parameter(name = ApiConstants.NETWORK_ID,
type = CommandType.UUID,
entityType = NetworkResponse.class,
description = "The network of the vm the Port Forwarding rule will be created for. "
- + "Required when public Ip address is not associated with any Guest network yet (VPC case)")
+ + "Required when public Ip address is not associated with any Guest network yet (VPC case)")
private Long networkId;
- @Parameter(name = ApiConstants.VM_GUEST_IP, type = CommandType.STRING, required = false, description = "VM guest nic Secondary ip address for the port forwarding rule")
+ @Parameter(name = ApiConstants.VM_GUEST_IP,
+ type = CommandType.STRING,
+ required = false,
+ description = "VM guest nic Secondary ip address for the port forwarding rule")
private String vmSecondaryIp;
// ///////////////////////////////////////////////////
@@ -126,10 +142,11 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements P
return virtualMachineId;
}
+ @Override
public List<String> getSourceCidrList() {
if (cidrlist != null) {
throw new InvalidParameterValueException("Parameter cidrList is deprecated; if you need to open firewall "
- + "rule for the specific cidr, please refer to createFirewallRule command");
+ + "rule for the specific cidr, please refer to createFirewallRule command");
}
return null;
}
@@ -264,7 +281,7 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements P
}
if (ntwkId == null) {
throw new InvalidParameterValueException("Unable to create port forwarding rule for the ipAddress id=" + ipAddressId +
- " as ip is not associated with any network and no networkId is passed in");
+ " as ip is not associated with any network and no networkId is passed in");
}
return ntwkId;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
index 5d23cc9..8e7b679 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
@@ -17,15 +17,13 @@
package org.apache.cloudstack.api.command.user.firewall;
-import org.apache.cloudstack.api.APICommand;
-
import org.apache.log4j.Logger;
+import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.AccountResponse;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
index ab3298a..c3029b8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.firewall;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceUnavailableException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
index be1a8a3..c493dd0 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
@@ -43,7 +43,11 @@ public class DeletePortForwardingRuleCmd extends BaseAsyncCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the port forwarding rule")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = FirewallRuleResponse.class,
+ required = true,
+ description = "the ID of the port forwarding rule")
private Long id;
// unexposed parameter needed for events logging
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java
index 71e304a..4ac94df 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java
@@ -20,17 +20,16 @@ package org.apache.cloudstack.api.command.user.firewall;
import java.util.ArrayList;
import java.util.List;
-import org.apache.cloudstack.api.APICommand;
import org.apache.log4j.Logger;
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.FirewallResponse;
import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
+
import com.cloud.network.rules.FirewallRule;
import com.cloud.utils.Pair;
@@ -45,21 +44,27 @@ public class ListEgressFirewallRulesCmd extends ListFirewallRulesCmd {
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, description = "Lists rule with the specified ID.")
private Long id;
- @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "the id network network for the egress firwall services")
+ @Parameter(name = ApiConstants.NETWORK_ID,
+ type = CommandType.UUID,
+ entityType = NetworkResponse.class,
+ description = "the id network network for the egress firwall services")
private Long networkId;
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
+ @Override
public Long getNetworkId() {
return networkId;
}
+ @Override
public FirewallRule.TrafficType getTrafficType() {
return FirewallRule.TrafficType.Egress;
}
+ @Override
public Long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java
index bdfdd91..44d26e4 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.firewall;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
@@ -28,7 +30,6 @@ import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.rules.FirewallRule;
import com.cloud.utils.Pair;
@@ -44,10 +45,17 @@ public class ListFirewallRulesCmd extends BaseListTaggedResourcesCmd {
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, description = "Lists rule with the specified ID.")
private Long id;
- @Parameter(name = ApiConstants.IP_ADDRESS_ID, type = CommandType.UUID, entityType = IPAddressResponse.class, description = "the id of IP address of the firwall services")
+ @Parameter(name = ApiConstants.IP_ADDRESS_ID,
+ type = CommandType.UUID,
+ entityType = IPAddressResponse.class,
+ description = "the id of IP address of the firwall services")
private Long ipAddressId;
- @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "list firewall rules for ceratin network", since = "4.3")
+ @Parameter(name = ApiConstants.NETWORK_ID,
+ type = CommandType.UUID,
+ entityType = NetworkResponse.class,
+ description = "list firewall rules for ceratin network",
+ since = "4.3")
private Long networkId;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
index 554ead6..bd8a7a1 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.firewall;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
@@ -27,7 +29,6 @@ import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.rules.PortForwardingRule;
import com.cloud.utils.Pair;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
index 6ccf2ad..d7e380f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.firewall;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseAsyncCmd;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
@@ -47,7 +48,10 @@ public class UpdatePortForwardingRuleCmd extends BaseAsyncCmd {
@Parameter(name = ApiConstants.PRIVATE_PORT, type = CommandType.STRING, required = true, description = "the private port of the port forwarding rule")
private String privatePort;
- @Parameter(name = ApiConstants.PROTOCOL, type = CommandType.STRING, required = true, description = "the protocol for the port fowarding rule. Valid values are TCP or UDP.")
+ @Parameter(name = ApiConstants.PROTOCOL,
+ type = CommandType.STRING,
+ required = true,
+ description = "the protocol for the port fowarding rule. Valid values are TCP or UDP.")
private String protocol;
@Parameter(name = ApiConstants.IP_ADDRESS_ID,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java
index 23d6cda..604f1ed 100644
--- a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.guest;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.command.user.iso.ListIsosCmd;
import org.apache.cloudstack.api.response.GuestOSCategoryResponse;
import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.log4j.Logger;
import com.cloud.storage.GuestOsCategory;
import com.cloud.utils.Pair;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java
index 27b7b85..287fb1e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.guest;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -27,7 +29,6 @@ import org.apache.cloudstack.api.command.user.iso.ListIsosCmd;
import org.apache.cloudstack.api.response.GuestOSCategoryResponse;
import org.apache.cloudstack.api.response.GuestOSResponse;
import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.log4j.Logger;
import com.cloud.storage.GuestOS;
import com.cloud.utils.Pair;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java
index 46488a0..d38c816 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.iso;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.uservm.UserVm;
@@ -46,7 +46,11 @@ public class AttachIsoCmd extends BaseAsyncCmd {
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = TemplateResponse.class, required = true, description = "the ID of the ISO file")
private Long id;
- @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, required = true, description = "the ID of the virtual machine")
+ @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
+ type = CommandType.UUID,
+ entityType = UserVmResponse.class,
+ required = true,
+ description = "the ID of the virtual machine")
private Long virtualMachineId;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java
index 42e55d4..3619318 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java
@@ -16,10 +16,11 @@
// under the License.
package org.apache.cloudstack.api.command.user.iso;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.command.user.template.CopyTemplateCmd;
import org.apache.cloudstack.api.response.TemplateResponse;
-import org.apache.log4j.Logger;
@APICommand(name = "copyIso", description = "Copies an iso from one zone to another.", responseObject = TemplateResponse.class)
public class CopyIsoCmd extends CopyTemplateCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
index df5e624..91ad5f1 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.iso;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
@@ -97,10 +97,12 @@ public class DeleteIsoCmd extends BaseAsyncCmd {
return "Deleting iso " + getId();
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Iso;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
index ce50b0f..e40195b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.iso;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -23,9 +25,7 @@ import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.user.vm.DeployVMCmd;
-import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
@@ -41,7 +41,11 @@ public class DetachIsoCmd extends BaseAsyncCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, required = true, description = "The ID of the virtual machine")
+ @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
+ type = CommandType.UUID,
+ entityType = UserVmResponse.class,
+ required = true,
+ description = "The ID of the virtual machine")
private Long virtualMachineId;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
index 90744c2..2fb215a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.iso;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -28,13 +30,10 @@ import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InternalErrorException;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
-import com.cloud.utils.Pair;
@APICommand(name = "extractIso", description = "Extracts an ISO", responseObject = ExtractResponse.class)
public class ExtractIsoCmd extends BaseAsyncCmd {
@@ -116,10 +115,12 @@ public class ExtractIsoCmd extends BaseAsyncCmd {
return s_name;
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Iso;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java
index 1e91640..9d9e44b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java
@@ -16,10 +16,11 @@
// under the License.
package org.apache.cloudstack.api.command.user.iso;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.BaseListTemplateOrIsoPermissionsCmd;
import org.apache.cloudstack.api.response.TemplatePermissionsResponse;
-import org.apache.log4j.Logger;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.template.VirtualMachineTemplate;
@@ -42,6 +43,7 @@ public class ListIsoPermissionsCmd extends BaseListTemplateOrIsoPermissionsCmd {
return Logger.getLogger(ListIsoPermissionsCmd.class.getName());
}
+ @Override
protected boolean templateIsCorrectType(VirtualMachineTemplate template) {
return template.getFormat().equals(ImageFormat.ISO);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
index 4e55500..3e66e52 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
@@ -16,9 +16,7 @@
// under the License.
package org.apache.cloudstack.api.command.user.iso;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
@@ -30,11 +28,8 @@ import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.template.VirtualMachineTemplate.TemplateFilter;
import com.cloud.user.Account;
-import com.cloud.utils.Pair;
@APICommand(name = "listIsos", description = "Lists all available ISO files.", responseObject = TemplateResponse.class)
public class ListIsosCmd extends BaseListTaggedResourcesCmd {
@@ -64,12 +59,12 @@ public class ListIsosCmd extends BaseListTaggedResourcesCmd {
@Parameter(name = ApiConstants.ISO_FILTER,
type = CommandType.STRING,
description = "possible values are \"featured\", \"self\", \"selfexecutable\",\"sharedexecutable\",\"executable\", and \"community\". "
- + "* featured : templates that have been marked as featured and public. "
- + "* self : templates that have been registered or created by the calling user. "
- + "* selfexecutable : same as self, but only returns templates that can be used to deploy a new VM. "
- + "* sharedexecutable : templates ready to be deployed that have been granted to the calling user by another user. "
- + "* executable : templates that are owned by the calling user, or public templates, that can be used to deploy a VM. "
- + "* community : templates that have been marked as public but not featured. " + "* all : all templates (only usable by admins).")
+ + "* featured : templates that have been marked as featured and public. "
+ + "* self : templates that have been registered or created by the calling user. "
+ + "* selfexecutable : same as self, but only returns templates that can be used to deploy a new VM. "
+ + "* sharedexecutable : templates ready to be deployed that have been granted to the calling user by another user. "
+ + "* executable : templates that are owned by the calling user, or public templates, that can be used to deploy a VM. "
+ + "* community : templates that have been marked as public but not featured. " + "* all : all templates (only usable by admins).")
private String isoFilter = TemplateFilter.selfexecutable.toString();
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "list all isos by name")
@@ -120,9 +115,9 @@ public class ListIsosCmd extends BaseListTaggedResourcesCmd {
boolean isAccountSpecific = (account == null || isAdmin(account.getType())) && (getAccountName() != null) && (getDomainId() != null);
// Show only those that are downloaded.
TemplateFilter templateFilter = TemplateFilter.valueOf(getIsoFilter());
- boolean onlyReady = (templateFilter == TemplateFilter.featured) || (templateFilter == TemplateFilter.selfexecutable) ||
- (templateFilter == TemplateFilter.sharedexecutable) || (templateFilter == TemplateFilter.executable && isAccountSpecific) ||
- (templateFilter == TemplateFilter.community);
+ boolean onlyReady =
+ (templateFilter == TemplateFilter.featured) || (templateFilter == TemplateFilter.selfexecutable) || (templateFilter == TemplateFilter.sharedexecutable) ||
+ (templateFilter == TemplateFilter.executable && isAccountSpecific) || (templateFilter == TemplateFilter.community);
if (!onlyReady) {
if (isReady() != null && isReady().booleanValue() != onlyReady) {
@@ -142,6 +137,7 @@ public class ListIsosCmd extends BaseListTaggedResourcesCmd {
return s_name;
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Iso;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
index a2b8a6e..29e3d67 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.iso;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -32,8 +34,6 @@ import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.exception.ResourceAllocationException;
import com.cloud.template.VirtualMachineTemplate;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java
index 64183ed..6a471c9 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java
@@ -16,12 +16,13 @@
// under the License.
package org.apache.cloudstack.api.command.user.iso;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseUpdateTemplateOrIsoCmd;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.TemplateResponse;
-import org.apache.log4j.Logger;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java
index e6d5ca7..8267b5c 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java
@@ -16,20 +16,23 @@
// under the License.
package org.apache.cloudstack.api.command.user.iso;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.BaseUpdateTemplateOrIsoPermissionsCmd;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
@APICommand(name = "updateIsoPermissions", description = "Updates iso permissions", responseObject = SuccessResponse.class)
public class UpdateIsoPermissionsCmd extends BaseUpdateTemplateOrIsoPermissionsCmd {
+ @Override
protected String getResponseName() {
return "updateisopermissionsresponse";
}
+ @Override
protected Logger getLogger() {
return Logger.getLogger(UpdateIsoPermissionsCmd.class.getName());
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java b/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java
index a24ba66..1f9f5db 100644
--- a/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java
@@ -16,12 +16,13 @@
// under the License.
package org.apache.cloudstack.api.command.user.job;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.AsyncJobResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
index fa8b6fb..4ea4a58 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
@@ -16,15 +16,26 @@
// under the License.
package org.apache.cloudstack.api.command.user.loadbalancer;
-import com.cloud.event.EventTypes;
-import com.cloud.exception.*;
-import com.cloud.network.rules.LoadBalancer;
-import com.cloud.user.Account;
-import org.apache.cloudstack.api.*;
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.SslCertResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
+
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.rules.LoadBalancer;
+import com.cloud.user.Account;
@APICommand(name = "assignCertToLoadBalancer", description = "Assigns a certificate to a Load Balancer Rule", responseObject = SuccessResponse.class)
public class AssignCertToLoadBalancerCmd extends BaseAsyncCmd {
@@ -33,15 +44,23 @@ public class AssignCertToLoadBalancerCmd extends BaseAsyncCmd {
private static final String s_name = "assignCertToLoadBalancer";
- @Parameter(name = ApiConstants.LBID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule")
+ @Parameter(name = ApiConstants.LBID,
+ type = CommandType.UUID,
+ entityType = FirewallRuleResponse.class,
+ required = true,
+ description = "the ID of the load balancer rule")
Long lbRuleId;
- @Parameter(name = ApiConstants.CERTIFICATE_ID, type = CommandType.UUID, entityType = SslCertResponse.class, required = true, description = "the ID of the certificate")
+ @Parameter(name = ApiConstants.CERTIFICATE_ID,
+ type = CommandType.UUID,
+ entityType = SslCertResponse.class,
+ required = true,
+ description = "the ID of the certificate")
Long certId;
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException,
- NetworkRuleConflictException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException, NetworkRuleConflictException {
//To change body of implemented methods use File | Settings | File Templates.
if (_lbService.assignCertToLoadBalancer(getLbRuleId(), getCertId())) {
SuccessResponse response = new SuccessResponse(getCommandName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java
index 3db326f..bcf6200 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.loadbalancer;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -29,8 +31,6 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.rules.LoadBalancer;
@@ -49,7 +49,11 @@ public class AssignToLoadBalancerRuleCmd extends BaseAsyncCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = FirewallRuleResponse.class,
+ required = true,
+ description = "the ID of the load balancer rule")
private Long id;
@Parameter(name = ApiConstants.VIRTUAL_MACHINE_IDS,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
index 84b6994..0b8d377 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.loadbalancer;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.network.lb.ApplicationLoadBalancerRule;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InsufficientAddressCapacityException;
import com.cloud.exception.InsufficientVirtualNetworkCapcityException;
@@ -63,7 +63,10 @@ public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd {
description = "The guest network the Load Balancer will be created for")
private Long networkId;
- @Parameter(name = ApiConstants.SOURCE_PORT, type = CommandType.INTEGER, required = true, description = "the source port the network traffic will be load balanced from")
+ @Parameter(name = ApiConstants.SOURCE_PORT,
+ type = CommandType.INTEGER,
+ required = true,
+ description = "the source port the network traffic will be load balanced from")
private Integer sourcePort;
@Parameter(name = ApiConstants.ALGORITHM, type = CommandType.STRING, required = true, description = "load balancer algorithm (source, roundrobin, leastconn)")
@@ -85,7 +88,10 @@ public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd {
description = "the network id of the source ip address")
private Long sourceIpNetworkId;
- @Parameter(name = ApiConstants.SCHEME, type = CommandType.STRING, required = true, description = "the load balancer scheme. Supported value in this release is Internal")
+ @Parameter(name = ApiConstants.SCHEME,
+ type = CommandType.STRING,
+ required = true,
+ description = "the load balancer scheme. Supported value in this release is Internal")
private String scheme;
/////////////////////////////////////////////////////
@@ -207,8 +213,9 @@ public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd {
public void create() {
try {
- ApplicationLoadBalancerRule result = _appLbService.createApplicationLoadBalancer(getName(), getDescription(), getScheme(), getSourceIpNetworkId(), getSourceIp(),
- getSourcePort(), getInstancePort(), getAlgorithm(), getNetworkId(), getEntityOwnerId());
+ ApplicationLoadBalancerRule result =
+ _appLbService.createApplicationLoadBalancer(getName(), getDescription(), getScheme(), getSourceIpNetworkId(), getSourceIp(), getSourcePort(),
+ getInstancePort(), getAlgorithm(), getNetworkId(), getEntityOwnerId());
this.setEntityId(result.getId());
this.setEntityUuid(result.getUuid());
} catch (NetworkRuleConflictException e) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
index 09d9289..5ff7239 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
@@ -16,30 +16,30 @@
// under the License.
package org.apache.cloudstack.api.command.user.loadbalancer;
-import org.apache.cloudstack.api.response.FirewallRuleResponse;
-
import org.apache.log4j.Logger;
+import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
-import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.FirewallRuleResponse;
+import org.apache.cloudstack.api.response.LBHealthCheckResponse;
+import org.apache.cloudstack.context.CallContext;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.rules.HealthCheckPolicy;
-
-import org.apache.cloudstack.api.response.LBHealthCheckResponse;
-import org.apache.cloudstack.context.CallContext;
-
import com.cloud.network.rules.LoadBalancer;
import com.cloud.user.Account;
-@APICommand(name = "createLBHealthCheckPolicy", description = "Creates a Load Balancer healthcheck policy ", responseObject = LBHealthCheckResponse.class, since = "4.2.0")
+@APICommand(name = "createLBHealthCheckPolicy",
+ description = "Creates a Load Balancer healthcheck policy ",
+ responseObject = LBHealthCheckResponse.class,
+ since = "4.2.0")
@SuppressWarnings("rawtypes")
public class CreateLBHealthCheckPolicyCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateLBHealthCheckPolicyCmd.class.getName());
@@ -50,7 +50,11 @@ public class CreateLBHealthCheckPolicyCmd extends BaseAsyncCreateCmd {
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.LBID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule")
+ @Parameter(name = ApiConstants.LBID,
+ type = CommandType.UUID,
+ entityType = FirewallRuleResponse.class,
+ required = true,
+ description = "the ID of the load balancer rule")
private Long lbRuleId;
@Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "the description of the load balancer HealthCheck policy")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
index 3649d1a..159fcf5 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.loadbalancer;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -29,8 +31,6 @@ import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.LBStickinessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.NetworkRuleConflictException;
@@ -51,7 +51,11 @@ public class CreateLBStickinessPolicyCmd extends BaseAsyncCreateCmd {
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.LBID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule")
+ @Parameter(name = ApiConstants.LBID,
+ type = CommandType.UUID,
+ entityType = FirewallRuleResponse.class,
+ required = true,
+ description = "the ID of the load balancer rule")
private Long lbRuleId;
@Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "the description of the LB Stickiness policy")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
index c7d7618..764e379 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.loadbalancer;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -33,8 +35,6 @@ import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
import com.cloud.event.EventTypes;
@@ -93,14 +93,14 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L
description = "the public port from where the network traffic will be load balanced from")
private Integer publicPort;
- @Parameter(name = ApiConstants.OPEN_FIREWALL,
- type = CommandType.BOOLEAN,
- description = "if true, firewall rule for"
- + " source/end pubic port is automatically created; if false - firewall rule has to be created explicitely. If not specified 1) defaulted to false when LB"
- + " rule is being created for VPC guest network 2) in all other cases defaulted to true")
+ @Parameter(name = ApiConstants.OPEN_FIREWALL, type = CommandType.BOOLEAN, description = "if true, firewall rule for"
+ + " source/end pubic port is automatically created; if false - firewall rule has to be created explicitely. If not specified 1) defaulted to false when LB"
+ + " rule is being created for VPC guest network 2) in all other cases defaulted to true")
private Boolean openFirewall;
- @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the account associated with the load balancer. Must be used with the domainId parameter.")
+ @Parameter(name = ApiConstants.ACCOUNT,
+ type = CommandType.STRING,
+ description = "the account associated with the load balancer. Must be used with the domainId parameter.")
private String accountName;
@Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "the domain ID associated with the load balancer")
@@ -109,10 +109,8 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L
@Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.LIST, collectionType = CommandType.STRING, description = "the cidr list to forward traffic from")
private List<String> cidrlist;
- @Parameter(name = ApiConstants.NETWORK_ID,
- type = CommandType.UUID,
- entityType = NetworkResponse.class,
- description = "The guest network this " + "rule will be created for. Required when public Ip address is not associated with any Guest network yet (VPC case)")
+ @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "The guest network this "
+ + "rule will be created for. Required when public Ip address is not associated with any Guest network yet (VPC case)")
private Long networkId;
@Parameter(name = ApiConstants.PROTOCOL, type = CommandType.STRING, description = "The protocol for the LB")
@@ -183,7 +181,8 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L
List<? extends Network> networks = _networkService.getIsolatedNetworksOwnedByAccountInZone(getZoneId(), _accountService.getAccount(getEntityOwnerId()));
if (networks.size() == 0) {
String domain = _domainService.getDomain(getDomainId()).getName();
- throw new InvalidParameterValueException("Account name=" + getAccountName() + " domain=" + domain + " doesn't have virtual networks in zone=" + zone.getName());
+ throw new InvalidParameterValueException("Account name=" + getAccountName() + " domain=" + domain + " doesn't have virtual networks in zone=" +
+ zone.getName());
}
if (networks.size() < 1) {
@@ -300,8 +299,9 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L
"Parameter cidrList is deprecated; if you need to open firewall rule for the specific cidr, please refer to createFirewallRule command");
}
try {
- LoadBalancer result = _lbService.createPublicLoadBalancerRule(getXid(), getName(), getDescription(), getSourcePortStart(), getSourcePortEnd(), getDefaultPortStart(),
- getDefaultPortEnd(), getSourceIpAddressId(), getProtocol(), getAlgorithm(), getNetworkId(), getEntityOwnerId(), getOpenFirewall(), getLbProtocol());
+ LoadBalancer result =
+ _lbService.createPublicLoadBalancerRule(getXid(), getName(), getDescription(), getSourcePortStart(), getSourcePortEnd(), getDefaultPortStart(),
+ getDefaultPortEnd(), getSourceIpAddressId(), getProtocol(), getAlgorithm(), getNetworkId(), getEntityOwnerId(), getOpenFirewall(), getLbProtocol());
this.setEntityId(result.getId());
this.setEntityUuid(result.getUuid());
} catch (NetworkRuleConflictException e) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
index f578461..0b53d53 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.loadbalancer;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.network.lb.ApplicationLoadBalancerRule;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java
index e1032a2..d625ed5 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java
@@ -16,16 +16,15 @@
// under the License.
package org.apache.cloudstack.api.command.user.loadbalancer;
-import org.apache.cloudstack.api.response.LBHealthCheckResponse;
-
import org.apache.log4j.Logger;
+import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.LBHealthCheckResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java
index 9c0f429..c4f72d9 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.loadbalancer;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.LBStickinessResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.rules.LoadBalancer;
@@ -42,7 +42,11 @@ public class DeleteLBStickinessPolicyCmd extends BaseAsyncCmd {
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = LBStickinessResponse.class, required = true, description = "the ID of the LB stickiness policy")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = LBStickinessResponse.class,
+ required = true,
+ description = "the ID of the LB stickiness policy")
private Long id;
// ///////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
index fea84f4..1dc3cd1 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.loadbalancer;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.rules.LoadBalancer;
@@ -42,7 +42,11 @@ public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = FirewallRuleResponse.class,
+ required = true,
+ description = "the ID of the load balancer rule")
private Long id;
/////////////////////////////////////////////////////
[31/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeletePlacementGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeletePlacementGroup.java b/awsapi/src/com/amazon/ec2/DeletePlacementGroup.java
index cbb629c..f4800dc 100644
--- a/awsapi/src/com/amazon/ec2/DeletePlacementGroup.java
+++ b/awsapi/src/com/amazon/ec2/DeletePlacementGroup.java
@@ -98,7 +98,8 @@ public class DeletePlacementGroup implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeletePlacementGroup implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeletePlacementGroup implements org.apache.axis2.databinding.ADBBea
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeletePlacementGroup").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeletePlacementGroup").equals(reader.getName())) {
object.setDeletePlacementGroup(com.amazon.ec2.DeletePlacementGroupType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponse.java b/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponse.java
index d00855a..7f329ea 100644
--- a/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DeletePlacementGroupResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeletePlacementGroupResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeletePlacementGroupResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DeletePlacementGroupResponse implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DeletePlacementGroupResponse implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponseType.java b/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponseType.java
index 5d56700..dc68858 100644
--- a/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponseType.java
@@ -125,7 +125,8 @@ public class DeletePlacementGroupResponseType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeletePlacementGroupResponseType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeletePlacementGroupType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeletePlacementGroupType.java b/awsapi/src/com/amazon/ec2/DeletePlacementGroupType.java
index 4dc202c..fbee103 100644
--- a/awsapi/src/com/amazon/ec2/DeletePlacementGroupType.java
+++ b/awsapi/src/com/amazon/ec2/DeletePlacementGroupType.java
@@ -101,7 +101,8 @@ public class DeletePlacementGroupType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DeletePlacementGroupType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteRoute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRoute.java b/awsapi/src/com/amazon/ec2/DeleteRoute.java
index 5ce30ee..a02f2dd 100644
--- a/awsapi/src/com/amazon/ec2/DeleteRoute.java
+++ b/awsapi/src/com/amazon/ec2/DeleteRoute.java
@@ -98,7 +98,8 @@ public class DeleteRoute implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteRoute implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteRouteResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteResponse.java b/awsapi/src/com/amazon/ec2/DeleteRouteResponse.java
index d0e85c8..2f49bda 100644
--- a/awsapi/src/com/amazon/ec2/DeleteRouteResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteResponse.java
@@ -98,7 +98,8 @@ public class DeleteRouteResponse implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteRouteResponse implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeleteRouteResponse implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteRouteResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteRouteResponse").equals(reader.getName())) {
object.setDeleteRouteResponse(com.amazon.ec2.DeleteRouteResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteRouteResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteResponseType.java b/awsapi/src/com/amazon/ec2/DeleteRouteResponseType.java
index 6c97cb6..9bc5503 100644
--- a/awsapi/src/com/amazon/ec2/DeleteRouteResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteResponseType.java
@@ -125,7 +125,8 @@ public class DeleteRouteResponseType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeleteRouteResponseType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteRouteTable.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteTable.java b/awsapi/src/com/amazon/ec2/DeleteRouteTable.java
index c740911..e58c3d7 100644
--- a/awsapi/src/com/amazon/ec2/DeleteRouteTable.java
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteTable.java
@@ -98,7 +98,8 @@ public class DeleteRouteTable implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteRouteTable implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeleteRouteTable implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteRouteTable").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteRouteTable").equals(reader.getName())) {
object.setDeleteRouteTable(com.amazon.ec2.DeleteRouteTableType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteRouteTableResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteTableResponse.java b/awsapi/src/com/amazon/ec2/DeleteRouteTableResponse.java
index e3ec802..dbd5092 100644
--- a/awsapi/src/com/amazon/ec2/DeleteRouteTableResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteTableResponse.java
@@ -98,7 +98,8 @@ public class DeleteRouteTableResponse implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteRouteTableResponse implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteRouteTableResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteTableResponseType.java b/awsapi/src/com/amazon/ec2/DeleteRouteTableResponseType.java
index 759f0f3..e434ec8 100644
--- a/awsapi/src/com/amazon/ec2/DeleteRouteTableResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteTableResponseType.java
@@ -125,7 +125,8 @@ public class DeleteRouteTableResponseType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeleteRouteTableResponseType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteRouteTableType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteTableType.java b/awsapi/src/com/amazon/ec2/DeleteRouteTableType.java
index e4b4468..012b38a 100644
--- a/awsapi/src/com/amazon/ec2/DeleteRouteTableType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteTableType.java
@@ -101,7 +101,8 @@ public class DeleteRouteTableType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DeleteRouteTableType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteRouteType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteType.java b/awsapi/src/com/amazon/ec2/DeleteRouteType.java
index b63e79c..decf662 100644
--- a/awsapi/src/com/amazon/ec2/DeleteRouteType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteRouteType.java
@@ -125,7 +125,8 @@ public class DeleteRouteType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class DeleteRouteType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java b/awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java
index d71088f..2fefb7c 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java
@@ -98,7 +98,8 @@ public class DeleteSecurityGroup implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteSecurityGroup implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeleteSecurityGroup implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSecurityGroup").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSecurityGroup").equals(reader.getName())) {
object.setDeleteSecurityGroup(com.amazon.ec2.DeleteSecurityGroupType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponse.java b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponse.java
index 41ad33a..9f2cc6e 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DeleteSecurityGroupResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSecurityGroupResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSecurityGroupResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DeleteSecurityGroupResponse implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DeleteSecurityGroupResponse implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponseType.java b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponseType.java
index 8318e88..8d7ee94 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponseType.java
@@ -125,7 +125,8 @@ public class DeleteSecurityGroupResponseType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeleteSecurityGroupResponseType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupType.java b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupType.java
index fd87314..4be9090 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupType.java
@@ -168,7 +168,8 @@ public class DeleteSecurityGroupType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -282,9 +283,8 @@ public class DeleteSecurityGroupType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteSnapshot.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSnapshot.java b/awsapi/src/com/amazon/ec2/DeleteSnapshot.java
index d560d34..7d03926 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSnapshot.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSnapshot.java
@@ -98,7 +98,8 @@ public class DeleteSnapshot implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteSnapshot implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeleteSnapshot implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSnapshot").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSnapshot").equals(reader.getName())) {
object.setDeleteSnapshot(com.amazon.ec2.DeleteSnapshotType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteSnapshotResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSnapshotResponse.java b/awsapi/src/com/amazon/ec2/DeleteSnapshotResponse.java
index 57386a7..7c9b387 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSnapshotResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSnapshotResponse.java
@@ -98,7 +98,8 @@ public class DeleteSnapshotResponse implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteSnapshotResponse implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeleteSnapshotResponse implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSnapshotResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSnapshotResponse").equals(reader.getName())) {
object.setDeleteSnapshotResponse(com.amazon.ec2.DeleteSnapshotResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteSnapshotResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSnapshotResponseType.java b/awsapi/src/com/amazon/ec2/DeleteSnapshotResponseType.java
index f2acfa4..bf38c19 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSnapshotResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSnapshotResponseType.java
@@ -125,7 +125,8 @@ public class DeleteSnapshotResponseType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeleteSnapshotResponseType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteSnapshotType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSnapshotType.java b/awsapi/src/com/amazon/ec2/DeleteSnapshotType.java
index a0972f9..7aaf7b9 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSnapshotType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSnapshotType.java
@@ -101,7 +101,8 @@ public class DeleteSnapshotType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DeleteSnapshotType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscription.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscription.java b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscription.java
index 7565b33..2f1fe58 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscription.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscription.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DeleteSpotDatafeedSubscription implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSpotDatafeedSubscription", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSpotDatafeedSubscription",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DeleteSpotDatafeedSubscription implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DeleteSpotDatafeedSubscription implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponse.java b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponse.java
index 4b0e5a5..62ee37c 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponse.java
@@ -30,8 +30,8 @@ package com.amazon.ec2;
public class DeleteSpotDatafeedSubscriptionResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSpotDatafeedSubscriptionResponse",
- "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "DeleteSpotDatafeedSubscriptionResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -99,7 +99,8 @@ public class DeleteSpotDatafeedSubscriptionResponse implements org.apache.axis2.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -119,9 +120,8 @@ public class DeleteSpotDatafeedSubscriptionResponse implements org.apache.axis2.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponseType.java b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponseType.java
index 4dc8c92..e440fbd 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponseType.java
@@ -125,7 +125,8 @@ public class DeleteSpotDatafeedSubscriptionResponseType implements org.apache.ax
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeleteSpotDatafeedSubscriptionResponseType implements org.apache.ax
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionType.java b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionType.java
index 4bccd53..1ad2c21 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionType.java
@@ -77,7 +77,8 @@ public class DeleteSpotDatafeedSubscriptionType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -126,9 +127,8 @@ public class DeleteSpotDatafeedSubscriptionType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteSubnet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSubnet.java b/awsapi/src/com/amazon/ec2/DeleteSubnet.java
index cd0af6e..526d188 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSubnet.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSubnet.java
@@ -98,7 +98,8 @@ public class DeleteSubnet implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteSubnet implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java b/awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java
index 8b11313..dec01c9 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java
@@ -98,7 +98,8 @@ public class DeleteSubnetResponse implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteSubnetResponse implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeleteSubnetResponse implements org.apache.axis2.databinding.ADBBea
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSubnetResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSubnetResponse").equals(reader.getName())) {
object.setDeleteSubnetResponse(com.amazon.ec2.DeleteSubnetResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteSubnetResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSubnetResponseType.java b/awsapi/src/com/amazon/ec2/DeleteSubnetResponseType.java
index 4c85e93..fc38ee9 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSubnetResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSubnetResponseType.java
@@ -125,7 +125,8 @@ public class DeleteSubnetResponseType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeleteSubnetResponseType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteSubnetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteSubnetType.java b/awsapi/src/com/amazon/ec2/DeleteSubnetType.java
index c46d13c..58cff0c 100644
--- a/awsapi/src/com/amazon/ec2/DeleteSubnetType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteSubnetType.java
@@ -101,7 +101,8 @@ public class DeleteSubnetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DeleteSubnetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteTags.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteTags.java b/awsapi/src/com/amazon/ec2/DeleteTags.java
index 8464d2c..1bdf687 100644
--- a/awsapi/src/com/amazon/ec2/DeleteTags.java
+++ b/awsapi/src/com/amazon/ec2/DeleteTags.java
@@ -98,7 +98,8 @@ public class DeleteTags implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteTags implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteTagsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsResponse.java b/awsapi/src/com/amazon/ec2/DeleteTagsResponse.java
index 710deca..5d71af2 100644
--- a/awsapi/src/com/amazon/ec2/DeleteTagsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteTagsResponse.java
@@ -98,7 +98,8 @@ public class DeleteTagsResponse implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteTagsResponse implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeleteTagsResponse implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteTagsResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteTagsResponse").equals(reader.getName())) {
object.setDeleteTagsResponse(com.amazon.ec2.DeleteTagsResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteTagsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsResponseType.java b/awsapi/src/com/amazon/ec2/DeleteTagsResponseType.java
index 7357442..7f874f8 100644
--- a/awsapi/src/com/amazon/ec2/DeleteTagsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteTagsResponseType.java
@@ -125,7 +125,8 @@ public class DeleteTagsResponseType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeleteTagsResponseType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteTagsSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsSetItemType.java b/awsapi/src/com/amazon/ec2/DeleteTagsSetItemType.java
index 87acb04..7f7414d 100644
--- a/awsapi/src/com/amazon/ec2/DeleteTagsSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteTagsSetItemType.java
@@ -153,7 +153,8 @@ public class DeleteTagsSetItemType implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -267,9 +268,8 @@ public class DeleteTagsSetItemType implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteTagsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsSetType.java b/awsapi/src/com/amazon/ec2/DeleteTagsSetType.java
index 7ac07ea..d1f6462 100644
--- a/awsapi/src/com/amazon/ec2/DeleteTagsSetType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteTagsSetType.java
@@ -142,7 +142,8 @@ public class DeleteTagsSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DeleteTagsSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteTagsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsType.java b/awsapi/src/com/amazon/ec2/DeleteTagsType.java
index f270a44..7a64496 100644
--- a/awsapi/src/com/amazon/ec2/DeleteTagsType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteTagsType.java
@@ -125,7 +125,8 @@ public class DeleteTagsType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -184,9 +185,8 @@ public class DeleteTagsType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVolume.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVolume.java b/awsapi/src/com/amazon/ec2/DeleteVolume.java
index 0e9fda5..d35179a 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVolume.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVolume.java
@@ -98,7 +98,8 @@ public class DeleteVolume implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteVolume implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java b/awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java
index 0bfee8f..4f26c68 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java
@@ -98,7 +98,8 @@ public class DeleteVolumeResponse implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteVolumeResponse implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeleteVolumeResponse implements org.apache.axis2.databinding.ADBBea
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVolumeResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVolumeResponse").equals(reader.getName())) {
object.setDeleteVolumeResponse(com.amazon.ec2.DeleteVolumeResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVolumeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVolumeResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVolumeResponseType.java
index 918374b..d669378 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVolumeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVolumeResponseType.java
@@ -125,7 +125,8 @@ public class DeleteVolumeResponseType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeleteVolumeResponseType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVolumeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVolumeType.java b/awsapi/src/com/amazon/ec2/DeleteVolumeType.java
index c1709b7..80a8fcd 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVolumeType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVolumeType.java
@@ -101,7 +101,8 @@ public class DeleteVolumeType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DeleteVolumeType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVpc.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpc.java b/awsapi/src/com/amazon/ec2/DeleteVpc.java
index b7f087c..44f4c64 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpc.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpc.java
@@ -98,7 +98,8 @@ public class DeleteVpc implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteVpc implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVpcResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpcResponse.java b/awsapi/src/com/amazon/ec2/DeleteVpcResponse.java
index e013ee6..6b08429 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpcResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpcResponse.java
@@ -98,7 +98,8 @@ public class DeleteVpcResponse implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteVpcResponse implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeleteVpcResponse implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpcResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpcResponse").equals(reader.getName())) {
object.setDeleteVpcResponse(com.amazon.ec2.DeleteVpcResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVpcResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpcResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVpcResponseType.java
index 27ec47e..8c26793 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpcResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpcResponseType.java
@@ -125,7 +125,8 @@ public class DeleteVpcResponseType implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeleteVpcResponseType implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
[26/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeRouteTables.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRouteTables.java b/awsapi/src/com/amazon/ec2/DescribeRouteTables.java
index 81f44c9..87a9ffa 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRouteTables.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRouteTables.java
@@ -98,7 +98,8 @@ public class DescribeRouteTables implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeRouteTables implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeRouteTables implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeRouteTables").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeRouteTables").equals(reader.getName())) {
object.setDescribeRouteTables(com.amazon.ec2.DescribeRouteTablesType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponse.java b/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponse.java
index b44ade0..aa7f78d 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeRouteTablesResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeRouteTablesResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeRouteTablesResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeRouteTablesResponse implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeRouteTablesResponse implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponseType.java
index d693fe4..57156a0 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponseType.java
@@ -125,7 +125,8 @@ public class DescribeRouteTablesResponseType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeRouteTablesResponseType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeRouteTablesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeRouteTablesType.java b/awsapi/src/com/amazon/ec2/DescribeRouteTablesType.java
index a98c650..abdebd1 100644
--- a/awsapi/src/com/amazon/ec2/DescribeRouteTablesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeRouteTablesType.java
@@ -139,7 +139,8 @@ public class DescribeRouteTablesType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -198,9 +199,8 @@ public class DescribeRouteTablesType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSecurityGroups.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroups.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroups.java
index 234aafc..1a5dff4 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroups.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroups.java
@@ -98,7 +98,8 @@ public class DescribeSecurityGroups implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeSecurityGroups implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeSecurityGroups implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSecurityGroups").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSecurityGroups").equals(reader.getName())) {
object.setDescribeSecurityGroups(com.amazon.ec2.DescribeSecurityGroupsType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetItemType.java
index a05f08f..fcf2a81 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetItemType.java
@@ -101,7 +101,8 @@ public class DescribeSecurityGroupsIdSetItemType implements org.apache.axis2.dat
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DescribeSecurityGroupsIdSetItemType implements org.apache.axis2.dat
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetType.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetType.java
index fb9663f..c198ea7 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetType.java
@@ -142,7 +142,8 @@ public class DescribeSecurityGroupsIdSetType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeSecurityGroupsIdSetType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponse.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponse.java
index 53f6587..e70867f 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeSecurityGroupsResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSecurityGroupsResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSecurityGroupsResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeSecurityGroupsResponse implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeSecurityGroupsResponse implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponseType.java
index ef6a663..7d33d38 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponseType.java
@@ -125,7 +125,8 @@ public class DescribeSecurityGroupsResponseType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeSecurityGroupsResponseType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetItemType.java
index b1288f4..3718ba3 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetItemType.java
@@ -101,7 +101,8 @@ public class DescribeSecurityGroupsSetItemType implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DescribeSecurityGroupsSetItemType implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetType.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetType.java
index 9d64b46..a6e479f 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetType.java
@@ -142,7 +142,8 @@ public class DescribeSecurityGroupsSetType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeSecurityGroupsSetType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsType.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsType.java
index 76821c7..da026d3 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsType.java
@@ -177,7 +177,8 @@ public class DescribeSecurityGroupsType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -242,9 +243,8 @@ public class DescribeSecurityGroupsType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttribute.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttribute.java
index ad17a02..3b050f0 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttribute.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttribute.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeSnapshotAttribute implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshotAttribute", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME =
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshotAttribute", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeSnapshotAttribute implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeSnapshotAttribute implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponse.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponse.java
index c7484a3..c65624c 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeSnapshotAttributeResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshotAttributeResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "DescribeSnapshotAttributeResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeSnapshotAttributeResponse implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeSnapshotAttributeResponse implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseType.java
index e59fbdd..d63aee4 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseType.java
@@ -149,7 +149,8 @@ public class DescribeSnapshotAttributeResponseType implements org.apache.axis2.d
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -267,9 +268,8 @@ public class DescribeSnapshotAttributeResponseType implements org.apache.axis2.d
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseTypeChoice_type0.java
index bbc8f9e..718f473 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseTypeChoice_type0.java
@@ -168,7 +168,8 @@ public class DescribeSnapshotAttributeResponseTypeChoice_type0 implements org.ap
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -183,7 +184,8 @@ public class DescribeSnapshotAttributeResponseTypeChoice_type0 implements org.ap
java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/");
if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) {
- writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeSnapshotAttributeResponseTypeChoice_type0", xmlWriter);
+ writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeSnapshotAttributeResponseTypeChoice_type0",
+ xmlWriter);
} else {
writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeSnapshotAttributeResponseTypeChoice_type0", xmlWriter);
}
@@ -207,9 +209,8 @@ public class DescribeSnapshotAttributeResponseTypeChoice_type0 implements org.ap
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -399,7 +400,8 @@ public class DescribeSnapshotAttributeResponseTypeChoice_type0 implements org.ap
// from anyAttributes.
java.util.Vector handledAttributes = new java.util.Vector();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) {
object.setCreateVolumePermission(com.amazon.ec2.CreateVolumePermissionListType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeType.java
index 80f712e..db56e6d 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeType.java
@@ -125,7 +125,8 @@ public class DescribeSnapshotAttributeType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeSnapshotAttributeType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributesGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributesGroup.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributesGroup.java
index 9cbef7e..f787f7b 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributesGroup.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributesGroup.java
@@ -168,7 +168,8 @@ public class DescribeSnapshotAttributesGroup implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -207,9 +208,8 @@ public class DescribeSnapshotAttributesGroup implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -399,7 +399,8 @@ public class DescribeSnapshotAttributesGroup implements org.apache.axis2.databin
// from anyAttributes.
java.util.Vector handledAttributes = new java.util.Vector();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) {
object.setCreateVolumePermission(com.amazon.ec2.EmptyElementType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSnapshots.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshots.java b/awsapi/src/com/amazon/ec2/DescribeSnapshots.java
index 35944fb..0122c06 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshots.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshots.java
@@ -98,7 +98,8 @@ public class DescribeSnapshots implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeSnapshots implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeSnapshots implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshots").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshots").equals(reader.getName())) {
object.setDescribeSnapshots(com.amazon.ec2.DescribeSnapshotsType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnerType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnerType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnerType.java
index ad949b7..60f9ff1 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnerType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnerType.java
@@ -101,7 +101,8 @@ public class DescribeSnapshotsOwnerType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DescribeSnapshotsOwnerType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnersType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnersType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnersType.java
index 899b1f4..3b7254e 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnersType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnersType.java
@@ -142,7 +142,8 @@ public class DescribeSnapshotsOwnersType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeSnapshotsOwnersType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponse.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponse.java
index c535da8..be92192 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeSnapshotsResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshotsResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME =
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshotsResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeSnapshotsResponse implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeSnapshotsResponse implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponseType.java
index 3a0097e..54af188 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponseType.java
@@ -125,7 +125,8 @@ public class DescribeSnapshotsResponseType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeSnapshotsResponseType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableBySetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableBySetType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableBySetType.java
index 3f4611c..d096d2e 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableBySetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableBySetType.java
@@ -142,7 +142,8 @@ public class DescribeSnapshotsRestorableBySetType implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeSnapshotsRestorableBySetType implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableByType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableByType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableByType.java
index 797d69d..343b72c 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableByType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableByType.java
@@ -101,7 +101,8 @@ public class DescribeSnapshotsRestorableByType implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DescribeSnapshotsRestorableByType implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemResponseType.java
index 8eda786..519762d 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemResponseType.java
@@ -359,7 +359,8 @@ public class DescribeSnapshotsSetItemResponseType implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -703,9 +704,8 @@ public class DescribeSnapshotsSetItemResponseType implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemType.java
index a813b17..f1812f0 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemType.java
@@ -101,7 +101,8 @@ public class DescribeSnapshotsSetItemType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DescribeSnapshotsSetItemType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetResponseType.java
index ba16098..195863c 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetResponseType.java
@@ -142,7 +142,8 @@ public class DescribeSnapshotsSetResponseType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeSnapshotsSetResponseType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetType.java
index efc9973..5b3d87e 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetType.java
@@ -142,7 +142,8 @@ public class DescribeSnapshotsSetType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeSnapshotsSetType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSnapshotsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsType.java
index cf1a6b3..e3472a2 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsType.java
@@ -215,7 +215,8 @@ public class DescribeSnapshotsType implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -286,9 +287,8 @@ public class DescribeSnapshotsType implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscription.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscription.java b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscription.java
index 0d94357..5edf8d4 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscription.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscription.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeSpotDatafeedSubscription implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSpotDatafeedSubscription", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "DescribeSpotDatafeedSubscription", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeSpotDatafeedSubscription implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeSpotDatafeedSubscription implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponse.java b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponse.java
index 9d39196..e9d5141 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponse.java
@@ -30,8 +30,8 @@ package com.amazon.ec2;
public class DescribeSpotDatafeedSubscriptionResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSpotDatafeedSubscriptionResponse",
- "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "DescribeSpotDatafeedSubscriptionResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -99,7 +99,8 @@ public class DescribeSpotDatafeedSubscriptionResponse implements org.apache.axis
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -119,9 +120,8 @@ public class DescribeSpotDatafeedSubscriptionResponse implements org.apache.axis
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponseType.java
index f7db15d..846bb14 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponseType.java
@@ -125,7 +125,8 @@ public class DescribeSpotDatafeedSubscriptionResponseType implements org.apache.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeSpotDatafeedSubscriptionResponseType implements org.apache.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -445,7 +445,8 @@ public class DescribeSpotDatafeedSubscriptionResponseType implements org.apache.
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotDatafeedSubscription").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotDatafeedSubscription").equals(reader.getName())) {
object.setSpotDatafeedSubscription(com.amazon.ec2.SpotDatafeedSubscriptionType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionType.java b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionType.java
index 75180d9..3316c98 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionType.java
@@ -77,7 +77,8 @@ public class DescribeSpotDatafeedSubscriptionType implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -126,9 +127,8 @@ public class DescribeSpotDatafeedSubscriptionType implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequests.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequests.java b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequests.java
index 3025e4b..c413f97 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequests.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequests.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeSpotInstanceRequests implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSpotInstanceRequests", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSpotInstanceRequests",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeSpotInstanceRequests implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeSpotInstanceRequests implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponse.java b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponse.java
index 7f3cece..7f1f15d 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponse.java
@@ -30,8 +30,8 @@ package com.amazon.ec2;
public class DescribeSpotInstanceRequestsResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSpotInstanceRequestsResponse",
- "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "DescribeSpotInstanceRequestsResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -99,7 +99,8 @@ public class DescribeSpotInstanceRequestsResponse implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -119,9 +120,8 @@ public class DescribeSpotInstanceRequestsResponse implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponseType.java
index a48eedf..2a6ccf4 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponseType.java
@@ -125,7 +125,8 @@ public class DescribeSpotInstanceRequestsResponseType implements org.apache.axis
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeSpotInstanceRequestsResponseType implements org.apache.axis
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -445,7 +445,8 @@ public class DescribeSpotInstanceRequestsResponseType implements org.apache.axis
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestSet").equals(reader.getName())) {
object.setSpotInstanceRequestSet(com.amazon.ec2.SpotInstanceRequestSetType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsType.java b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsType.java
index e013be2..5da70ac 100644
--- a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsType.java
@@ -139,7 +139,8 @@ public class DescribeSpotInstanceRequestsType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -198,9 +199,8 @@ public class DescribeSpotInstanceRequestsType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -414,7 +414,8 @@ public class DescribeSpotInstanceRequestsType implements org.apache.axis2.databi
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestIdSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestIdSet").equals(reader.getName())) {
object.setSpotInstanceRequestIdSet(com.amazon.ec2.SpotInstanceRequestIdSetType.Factory.parse(reader));
[17/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponse.java b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponse.java
index 62ca506..4240767 100644
--- a/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class ResetInstanceAttributeResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetInstanceAttributeResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetInstanceAttributeResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class ResetInstanceAttributeResponse implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class ResetInstanceAttributeResponse implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponseType.java
index f1663d1..833c95c 100644
--- a/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponseType.java
@@ -125,7 +125,8 @@ public class ResetInstanceAttributeResponseType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class ResetInstanceAttributeResponseType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetInstanceAttributeType.java b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeType.java
index 9d7ba18..f339366 100644
--- a/awsapi/src/com/amazon/ec2/ResetInstanceAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeType.java
@@ -125,7 +125,8 @@ public class ResetInstanceAttributeType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class ResetInstanceAttributeType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetInstanceAttributesGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetInstanceAttributesGroup.java b/awsapi/src/com/amazon/ec2/ResetInstanceAttributesGroup.java
index 48e278d..681ba94 100644
--- a/awsapi/src/com/amazon/ec2/ResetInstanceAttributesGroup.java
+++ b/awsapi/src/com/amazon/ec2/ResetInstanceAttributesGroup.java
@@ -210,7 +210,8 @@ public class ResetInstanceAttributesGroup implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -255,9 +256,8 @@ public class ResetInstanceAttributesGroup implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttribute.java b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttribute.java
index 41f28a2..aee5e9a 100644
--- a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttribute.java
+++ b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttribute.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class ResetNetworkInterfaceAttribute implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetNetworkInterfaceAttribute", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetNetworkInterfaceAttribute",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class ResetNetworkInterfaceAttribute implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class ResetNetworkInterfaceAttribute implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponse.java b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponse.java
index 7afc6dc..212d161 100644
--- a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponse.java
@@ -30,8 +30,8 @@ package com.amazon.ec2;
public class ResetNetworkInterfaceAttributeResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetNetworkInterfaceAttributeResponse",
- "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "ResetNetworkInterfaceAttributeResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -99,7 +99,8 @@ public class ResetNetworkInterfaceAttributeResponse implements org.apache.axis2.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -119,9 +120,8 @@ public class ResetNetworkInterfaceAttributeResponse implements org.apache.axis2.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponseType.java
index c1e2222..afbe160 100644
--- a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponseType.java
@@ -125,7 +125,8 @@ public class ResetNetworkInterfaceAttributeResponseType implements org.apache.ax
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class ResetNetworkInterfaceAttributeResponseType implements org.apache.ax
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeType.java b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeType.java
index 7cf6fb6..28f91d3 100644
--- a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeType.java
@@ -125,7 +125,8 @@ public class ResetNetworkInterfaceAttributeType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class ResetNetworkInterfaceAttributeType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributesGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributesGroup.java b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributesGroup.java
index 2741812..605e77a 100644
--- a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributesGroup.java
+++ b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributesGroup.java
@@ -126,7 +126,8 @@ public class ResetNetworkInterfaceAttributesGroup implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -159,9 +160,8 @@ public class ResetNetworkInterfaceAttributesGroup implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetSnapshotAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetSnapshotAttribute.java b/awsapi/src/com/amazon/ec2/ResetSnapshotAttribute.java
index 171e04c..3df20ba 100644
--- a/awsapi/src/com/amazon/ec2/ResetSnapshotAttribute.java
+++ b/awsapi/src/com/amazon/ec2/ResetSnapshotAttribute.java
@@ -98,7 +98,8 @@ public class ResetSnapshotAttribute implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ResetSnapshotAttribute implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class ResetSnapshotAttribute implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetSnapshotAttribute").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetSnapshotAttribute").equals(reader.getName())) {
object.setResetSnapshotAttribute(com.amazon.ec2.ResetSnapshotAttributeType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponse.java b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponse.java
index 7241506..03e297d 100644
--- a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class ResetSnapshotAttributeResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetSnapshotAttributeResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetSnapshotAttributeResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class ResetSnapshotAttributeResponse implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class ResetSnapshotAttributeResponse implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponseType.java
index 5f5ee6c..3c99054 100644
--- a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponseType.java
@@ -125,7 +125,8 @@ public class ResetSnapshotAttributeResponseType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class ResetSnapshotAttributeResponseType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeType.java b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeType.java
index d3502d3..7936369 100644
--- a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeType.java
@@ -125,7 +125,8 @@ public class ResetSnapshotAttributeType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class ResetSnapshotAttributeType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributesGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributesGroup.java b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributesGroup.java
index 169b5ed..fbb397c 100644
--- a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributesGroup.java
+++ b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributesGroup.java
@@ -126,7 +126,8 @@ public class ResetSnapshotAttributesGroup implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -159,9 +160,8 @@ public class ResetSnapshotAttributesGroup implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -343,7 +343,8 @@ public class ResetSnapshotAttributesGroup implements org.apache.axis2.databindin
// from anyAttributes.
java.util.Vector handledAttributes = new java.util.Vector();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) {
object.setCreateVolumePermission(com.amazon.ec2.EmptyElementType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResourceIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResourceIdSetItemType.java b/awsapi/src/com/amazon/ec2/ResourceIdSetItemType.java
index fcfbd6b..9cac14a 100644
--- a/awsapi/src/com/amazon/ec2/ResourceIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/ResourceIdSetItemType.java
@@ -101,7 +101,8 @@ public class ResourceIdSetItemType implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class ResourceIdSetItemType implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResourceIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResourceIdSetType.java b/awsapi/src/com/amazon/ec2/ResourceIdSetType.java
index 5cbfb54..c77cc9a 100644
--- a/awsapi/src/com/amazon/ec2/ResourceIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/ResourceIdSetType.java
@@ -142,7 +142,8 @@ public class ResourceIdSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class ResourceIdSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResourceTagSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResourceTagSetItemType.java b/awsapi/src/com/amazon/ec2/ResourceTagSetItemType.java
index 7ec162e..70e3013 100644
--- a/awsapi/src/com/amazon/ec2/ResourceTagSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/ResourceTagSetItemType.java
@@ -125,7 +125,8 @@ public class ResourceTagSetItemType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class ResourceTagSetItemType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ResourceTagSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ResourceTagSetType.java b/awsapi/src/com/amazon/ec2/ResourceTagSetType.java
index 95e2f45..39ec3a4 100644
--- a/awsapi/src/com/amazon/ec2/ResourceTagSetType.java
+++ b/awsapi/src/com/amazon/ec2/ResourceTagSetType.java
@@ -142,7 +142,8 @@ public class ResourceTagSetType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class ResourceTagSetType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgress.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgress.java
index 4765af1..b1356db 100644
--- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgress.java
+++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgress.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class RevokeSecurityGroupEgress implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RevokeSecurityGroupEgress", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME =
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RevokeSecurityGroupEgress", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class RevokeSecurityGroupEgress implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class RevokeSecurityGroupEgress implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponse.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponse.java
index 6530008..67a6f48 100644
--- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponse.java
+++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class RevokeSecurityGroupEgressResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RevokeSecurityGroupEgressResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "RevokeSecurityGroupEgressResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class RevokeSecurityGroupEgressResponse implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class RevokeSecurityGroupEgressResponse implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponseType.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponseType.java
index 1801d7b..5865c3b 100644
--- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponseType.java
@@ -125,7 +125,8 @@ public class RevokeSecurityGroupEgressResponseType implements org.apache.axis2.d
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class RevokeSecurityGroupEgressResponseType implements org.apache.axis2.d
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressType.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressType.java
index 3929a67..a411905 100644
--- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressType.java
+++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressType.java
@@ -125,7 +125,8 @@ public class RevokeSecurityGroupEgressType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class RevokeSecurityGroupEgressType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngress.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngress.java
index 4ed8534..46fcf70 100644
--- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngress.java
+++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngress.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class RevokeSecurityGroupIngress implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RevokeSecurityGroupIngress", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RevokeSecurityGroupIngress",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class RevokeSecurityGroupIngress implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class RevokeSecurityGroupIngress implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponse.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponse.java
index d98b21c..2fa5da8 100644
--- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponse.java
+++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class RevokeSecurityGroupIngressResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RevokeSecurityGroupIngressResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "RevokeSecurityGroupIngressResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class RevokeSecurityGroupIngressResponse implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class RevokeSecurityGroupIngressResponse implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponseType.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponseType.java
index e07df98..298e81d 100644
--- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponseType.java
@@ -125,7 +125,8 @@ public class RevokeSecurityGroupIngressResponseType implements org.apache.axis2.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class RevokeSecurityGroupIngressResponseType implements org.apache.axis2.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressType.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressType.java
index dc6c4b7..047deee 100644
--- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressType.java
+++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressType.java
@@ -163,7 +163,8 @@ public class RevokeSecurityGroupIngressType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -254,9 +255,8 @@ public class RevokeSecurityGroupIngressType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressTypeChoice_type0.java
index d9c6e7f..911e3f0 100644
--- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressTypeChoice_type0.java
@@ -168,7 +168,8 @@ public class RevokeSecurityGroupIngressTypeChoice_type0 implements org.apache.ax
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -261,9 +262,8 @@ public class RevokeSecurityGroupIngressTypeChoice_type0 implements org.apache.ax
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RouteSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RouteSetType.java b/awsapi/src/com/amazon/ec2/RouteSetType.java
index c5909ed..3ea9d3a 100644
--- a/awsapi/src/com/amazon/ec2/RouteSetType.java
+++ b/awsapi/src/com/amazon/ec2/RouteSetType.java
@@ -142,7 +142,8 @@ public class RouteSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class RouteSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RouteTableAssociationSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RouteTableAssociationSetType.java b/awsapi/src/com/amazon/ec2/RouteTableAssociationSetType.java
index c137ec4..93a7a00 100644
--- a/awsapi/src/com/amazon/ec2/RouteTableAssociationSetType.java
+++ b/awsapi/src/com/amazon/ec2/RouteTableAssociationSetType.java
@@ -142,7 +142,8 @@ public class RouteTableAssociationSetType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class RouteTableAssociationSetType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RouteTableAssociationType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RouteTableAssociationType.java b/awsapi/src/com/amazon/ec2/RouteTableAssociationType.java
index 0246923..888cfa8 100644
--- a/awsapi/src/com/amazon/ec2/RouteTableAssociationType.java
+++ b/awsapi/src/com/amazon/ec2/RouteTableAssociationType.java
@@ -149,7 +149,8 @@ public class RouteTableAssociationType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -267,9 +268,8 @@ public class RouteTableAssociationType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -491,7 +491,8 @@ public class RouteTableAssociationType implements org.apache.axis2.databinding.A
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "routeTableAssociationId").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "routeTableAssociationId").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RouteTableAssociationTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RouteTableAssociationTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/RouteTableAssociationTypeChoice_type0.java
index ac3efca..0f6e4bc 100644
--- a/awsapi/src/com/amazon/ec2/RouteTableAssociationTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/RouteTableAssociationTypeChoice_type0.java
@@ -169,7 +169,8 @@ public class RouteTableAssociationTypeChoice_type0 implements org.apache.axis2.d
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -259,9 +260,8 @@ public class RouteTableAssociationTypeChoice_type0 implements org.apache.axis2.d
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RouteTableIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RouteTableIdSetItemType.java b/awsapi/src/com/amazon/ec2/RouteTableIdSetItemType.java
index 8af35fc..3f72067 100644
--- a/awsapi/src/com/amazon/ec2/RouteTableIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/RouteTableIdSetItemType.java
@@ -101,7 +101,8 @@ public class RouteTableIdSetItemType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class RouteTableIdSetItemType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RouteTableIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RouteTableIdSetType.java b/awsapi/src/com/amazon/ec2/RouteTableIdSetType.java
index 740afb2..c9b8bda 100644
--- a/awsapi/src/com/amazon/ec2/RouteTableIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/RouteTableIdSetType.java
@@ -142,7 +142,8 @@ public class RouteTableIdSetType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class RouteTableIdSetType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RouteTableSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RouteTableSetType.java b/awsapi/src/com/amazon/ec2/RouteTableSetType.java
index 9a90d85..c103da0 100644
--- a/awsapi/src/com/amazon/ec2/RouteTableSetType.java
+++ b/awsapi/src/com/amazon/ec2/RouteTableSetType.java
@@ -142,7 +142,8 @@ public class RouteTableSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class RouteTableSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,7 +463,8 @@ public class RouteTableSetType implements org.apache.axis2.databinding.ADBBean {
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.RouteTableType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.RouteTableType.class, list1));
+ object.setItem((com.amazon.ec2.RouteTableType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.RouteTableType.class,
+ list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RouteTableType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RouteTableType.java b/awsapi/src/com/amazon/ec2/RouteTableType.java
index ecc16f1..a010a29 100644
--- a/awsapi/src/com/amazon/ec2/RouteTableType.java
+++ b/awsapi/src/com/amazon/ec2/RouteTableType.java
@@ -235,7 +235,8 @@ public class RouteTableType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -368,9 +369,8 @@ public class RouteTableType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RouteType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RouteType.java b/awsapi/src/com/amazon/ec2/RouteType.java
index 6799265..7cd7eed 100644
--- a/awsapi/src/com/amazon/ec2/RouteType.java
+++ b/awsapi/src/com/amazon/ec2/RouteType.java
@@ -301,7 +301,8 @@ public class RouteType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -577,9 +578,8 @@ public class RouteType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RunInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RunInstances.java b/awsapi/src/com/amazon/ec2/RunInstances.java
index 228fef5..4abb155 100644
--- a/awsapi/src/com/amazon/ec2/RunInstances.java
+++ b/awsapi/src/com/amazon/ec2/RunInstances.java
@@ -98,7 +98,8 @@ public class RunInstances implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class RunInstances implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RunInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RunInstancesResponse.java b/awsapi/src/com/amazon/ec2/RunInstancesResponse.java
index 9f71aad..c0be36d 100644
--- a/awsapi/src/com/amazon/ec2/RunInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/RunInstancesResponse.java
@@ -98,7 +98,8 @@ public class RunInstancesResponse implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class RunInstancesResponse implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class RunInstancesResponse implements org.apache.axis2.databinding.ADBBea
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RunInstancesResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RunInstancesResponse").equals(reader.getName())) {
object.setRunInstancesResponse(com.amazon.ec2.RunInstancesResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RunInstancesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RunInstancesResponseType.java b/awsapi/src/com/amazon/ec2/RunInstancesResponseType.java
index 4dcc415..6d92a1e 100644
--- a/awsapi/src/com/amazon/ec2/RunInstancesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/RunInstancesResponseType.java
@@ -235,7 +235,8 @@ public class RunInstancesResponseType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -422,9 +423,8 @@ public class RunInstancesResponseType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/RunInstancesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/RunInstancesType.java b/awsapi/src/com/amazon/ec2/RunInstancesType.java
index b18fc2f..ad07a68 100644
--- a/awsapi/src/com/amazon/ec2/RunInstancesType.java
+++ b/awsapi/src/com/amazon/ec2/RunInstancesType.java
@@ -807,7 +807,8 @@ public class RunInstancesType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -1313,9 +1314,8 @@ public class RunInstancesType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -1888,7 +1888,8 @@ public class RunInstancesType implements org.apache.axis2.databinding.ADBBean {
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
[50/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/agent/src/com/cloud/agent/Agent.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/Agent.java b/agent/src/com/cloud/agent/Agent.java
index 9674510..b0113c7 100755
--- a/agent/src/com/cloud/agent/Agent.java
+++ b/agent/src/com/cloud/agent/Agent.java
@@ -35,9 +35,10 @@ import java.util.concurrent.atomic.AtomicInteger;
import javax.naming.ConfigurationException;
-import org.apache.cloudstack.managed.context.ManagedContextTimerTask;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.managed.context.ManagedContextTimerTask;
+
import com.cloud.agent.api.AgentControlAnswer;
import com.cloud.agent.api.AgentControlCommand;
import com.cloud.agent.api.Answer;
@@ -132,11 +133,13 @@ public class Agent implements HandlerFactory, IAgentControl {
Runtime.getRuntime().addShutdownHook(new ShutdownThread(this));
- _ugentTaskPool = new ThreadPoolExecutor(shell.getPingRetries(), 2 * shell.getPingRetries(), 10, TimeUnit.MINUTES, new SynchronousQueue<Runnable>(), new NamedThreadFactory(
- "UgentTask"));
+ _ugentTaskPool =
+ new ThreadPoolExecutor(shell.getPingRetries(), 2 * shell.getPingRetries(), 10, TimeUnit.MINUTES, new SynchronousQueue<Runnable>(), new NamedThreadFactory(
+ "UgentTask"));
- _executor = new ThreadPoolExecutor(_shell.getWorkers(), 5 * _shell.getWorkers(), 1, TimeUnit.DAYS, new LinkedBlockingQueue<Runnable>(), new NamedThreadFactory(
- "agentRequest-Handler"));
+ _executor =
+ new ThreadPoolExecutor(_shell.getWorkers(), 5 * _shell.getWorkers(), 1, TimeUnit.DAYS, new LinkedBlockingQueue<Runnable>(), new NamedThreadFactory(
+ "agentRequest-Handler"));
}
public Agent(IAgentShell shell, int localAgentId, ServerResource resource) throws ConfigurationException {
@@ -168,14 +171,16 @@ public class Agent implements HandlerFactory, IAgentControl {
s_logger.debug("Adding shutdown hook");
Runtime.getRuntime().addShutdownHook(new ShutdownThread(this));
- _ugentTaskPool = new ThreadPoolExecutor(shell.getPingRetries(), 2 * shell.getPingRetries(), 10, TimeUnit.MINUTES, new SynchronousQueue<Runnable>(), new NamedThreadFactory(
- "UgentTask"));
+ _ugentTaskPool =
+ new ThreadPoolExecutor(shell.getPingRetries(), 2 * shell.getPingRetries(), 10, TimeUnit.MINUTES, new SynchronousQueue<Runnable>(), new NamedThreadFactory(
+ "UgentTask"));
- _executor = new ThreadPoolExecutor(_shell.getWorkers(), 5 * _shell.getWorkers(), 1, TimeUnit.DAYS, new LinkedBlockingQueue<Runnable>(), new NamedThreadFactory(
- "agentRequest-Handler"));
+ _executor =
+ new ThreadPoolExecutor(_shell.getWorkers(), 5 * _shell.getWorkers(), 1, TimeUnit.DAYS, new LinkedBlockingQueue<Runnable>(), new NamedThreadFactory(
+ "agentRequest-Handler"));
s_logger.info("Agent [id = " + (_id != null ? _id : "new") + " : type = " + getResourceName() + " : zone = " + _shell.getZone() + " : pod = " + _shell.getPod() +
- " : workers = " + _shell.getWorkers() + " : host = " + _shell.getHost() + " : port = " + _shell.getPort());
+ " : workers = " + _shell.getWorkers() + " : host = " + _shell.getHost() + " : port = " + _shell.getPort());
}
public String getVersion() {
@@ -489,7 +494,7 @@ public class Agent implements HandlerFactory, IAgentControl {
} else {
if (cmd instanceof ReadyCommand) {
- processReadyCommand((ReadyCommand)cmd);
+ processReadyCommand(cmd);
}
_inProgress.incrementAndGet();
try {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/agent/src/com/cloud/agent/AgentShell.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/AgentShell.java b/agent/src/com/cloud/agent/AgentShell.java
index 1bab042..936e3cd 100644
--- a/agent/src/com/cloud/agent/AgentShell.java
+++ b/agent/src/com/cloud/agent/AgentShell.java
@@ -401,6 +401,7 @@ public class AgentShell implements IAgentShell, Daemon {
return _nextAgentId++;
}
+ @Override
public void start() {
try {
/* By default we only search for log4j.xml */
@@ -444,10 +445,12 @@ public class AgentShell implements IAgentShell, Daemon {
}
}
+ @Override
public void stop() {
_exit = true;
}
+ @Override
public void destroy() {
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/agent/src/com/cloud/agent/dhcp/DhcpProtocolParserServer.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/dhcp/DhcpProtocolParserServer.java b/agent/src/com/cloud/agent/dhcp/DhcpProtocolParserServer.java
index 9d4cda6..5d75acf 100644
--- a/agent/src/com/cloud/agent/dhcp/DhcpProtocolParserServer.java
+++ b/agent/src/com/cloud/agent/dhcp/DhcpProtocolParserServer.java
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.InetAddress;
-
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
@@ -42,6 +41,7 @@ public class DhcpProtocolParserServer extends Thread {
_running = true;
}
+ @Override
public void run() {
while (_running) {
try {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/agent/src/com/cloud/agent/dhcp/DhcpSnooper.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/dhcp/DhcpSnooper.java b/agent/src/com/cloud/agent/dhcp/DhcpSnooper.java
index e25e2cf..67718d5 100644
--- a/agent/src/com/cloud/agent/dhcp/DhcpSnooper.java
+++ b/agent/src/com/cloud/agent/dhcp/DhcpSnooper.java
@@ -33,6 +33,7 @@ public interface DhcpSnooper extends Adapter {
public Map<String, InetAddress> syncIpAddr();
+ @Override
public boolean stop();
public void initializeMacTable(List<Pair<String, String>> macVmNameList);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/agent/src/com/cloud/agent/mockvm/MockVmMgr.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/mockvm/MockVmMgr.java b/agent/src/com/cloud/agent/mockvm/MockVmMgr.java
index ff0d41e..b155cb7 100644
--- a/agent/src/com/cloud/agent/mockvm/MockVmMgr.java
+++ b/agent/src/com/cloud/agent/mockvm/MockVmMgr.java
@@ -53,8 +53,8 @@ public class MockVmMgr implements VmMgr {
}
@Override
- public String startVM(String vmName, String vnetId, String gateway, String dns, String privateIP, String privateMac, String privateMask, String publicIP, String publicMac,
- String publicMask, int cpuCount, int cpuUtilization, long ramSize, String localPath, String vncPassword) {
+ public String startVM(String vmName, String vnetId, String gateway, String dns, String privateIP, String privateMac, String privateMask, String publicIP,
+ String publicMac, String publicMask, int cpuCount, int cpuUtilization, long ramSize, String localPath, String vncPassword) {
if (s_logger.isInfoEnabled()) {
StringBuffer sb = new StringBuffer();
@@ -132,6 +132,7 @@ public class MockVmMgr implements VmMgr {
return false;
}
+ @Override
public MockVm getVm(String vmName) {
synchronized (this) {
MockVm vm = vms.get(vmName);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/agent/src/com/cloud/agent/mockvm/VmMgr.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/mockvm/VmMgr.java b/agent/src/com/cloud/agent/mockvm/VmMgr.java
index 95786aa..57bc4c1 100644
--- a/agent/src/com/cloud/agent/mockvm/VmMgr.java
+++ b/agent/src/com/cloud/agent/mockvm/VmMgr.java
@@ -25,8 +25,8 @@ import com.cloud.vm.VirtualMachine.State;
public interface VmMgr {
public Set<String> getCurrentVMs();
- public String startVM(String vmName, String vnetId, String gateway, String dns, String privateIP, String privateMac, String privateMask, String publicIP, String publicMac,
- String publicMask, int cpuCount, int cpuUtilization, long ramSize, String localPath, String vncPassword);
+ public String startVM(String vmName, String vnetId, String gateway, String dns, String privateIP, String privateMac, String privateMask, String publicIP,
+ String publicMac, String publicMask, int cpuCount, int cpuUtilization, long ramSize, String localPath, String vncPassword);
public String stopVM(String vmName, boolean force);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/agent/src/com/cloud/agent/resource/DummyResource.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/resource/DummyResource.java b/agent/src/com/cloud/agent/resource/DummyResource.java
index a316964..ec262a8 100755
--- a/agent/src/com/cloud/agent/resource/DummyResource.java
+++ b/agent/src/com/cloud/agent/resource/DummyResource.java
@@ -32,9 +32,9 @@ import com.cloud.agent.api.Command;
import com.cloud.agent.api.PingCommand;
import com.cloud.agent.api.StartupCommand;
import com.cloud.agent.api.StartupRoutingCommand;
+import com.cloud.agent.api.StartupRoutingCommand.VmState;
import com.cloud.agent.api.StartupStorageCommand;
import com.cloud.agent.api.StoragePoolInfo;
-import com.cloud.agent.api.StartupRoutingCommand.VmState;
import com.cloud.host.Host;
import com.cloud.host.Host.Type;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
@@ -110,14 +110,14 @@ public class DummyResource implements ServerResource {
protected void fillNetworkInformation(final StartupCommand cmd) {
- cmd.setPrivateIpAddress((String)getConfiguredProperty("private.ip.address", "127.0.0.1"));
- cmd.setPrivateMacAddress((String)getConfiguredProperty("private.mac.address", "8A:D2:54:3F:7C:C3"));
- cmd.setPrivateNetmask((String)getConfiguredProperty("private.ip.netmask", "255.255.255.0"));
+ cmd.setPrivateIpAddress(getConfiguredProperty("private.ip.address", "127.0.0.1"));
+ cmd.setPrivateMacAddress(getConfiguredProperty("private.mac.address", "8A:D2:54:3F:7C:C3"));
+ cmd.setPrivateNetmask(getConfiguredProperty("private.ip.netmask", "255.255.255.0"));
- cmd.setStorageIpAddress((String)getConfiguredProperty("private.ip.address", "127.0.0.1"));
- cmd.setStorageMacAddress((String)getConfiguredProperty("private.mac.address", "8A:D2:54:3F:7C:C3"));
- cmd.setStorageNetmask((String)getConfiguredProperty("private.ip.netmask", "255.255.255.0"));
- cmd.setGatewayIpAddress((String)getConfiguredProperty("gateway.ip.address", "127.0.0.1"));
+ cmd.setStorageIpAddress(getConfiguredProperty("private.ip.address", "127.0.0.1"));
+ cmd.setStorageMacAddress(getConfiguredProperty("private.mac.address", "8A:D2:54:3F:7C:C3"));
+ cmd.setStorageNetmask(getConfiguredProperty("private.ip.netmask", "255.255.255.0"));
+ cmd.setGatewayIpAddress(getConfiguredProperty("gateway.ip.address", "127.0.0.1"));
}
@@ -133,13 +133,13 @@ public class DummyResource implements ServerResource {
}
protected StoragePoolInfo initializeLocalStorage() {
- String hostIp = (String)getConfiguredProperty("private.ip.address", "127.0.0.1");
- String localStoragePath = (String)getConfiguredProperty("local.storage.path", "/mnt");
+ String hostIp = getConfiguredProperty("private.ip.address", "127.0.0.1");
+ String localStoragePath = getConfiguredProperty("local.storage.path", "/mnt");
String lh = hostIp + localStoragePath;
String uuid = UUID.nameUUIDFromBytes(lh.getBytes()).toString();
- String capacity = (String)getConfiguredProperty("local.storage.capacity", "1000000000");
- String available = (String)getConfiguredProperty("local.storage.avail", "10000000");
+ String capacity = getConfiguredProperty("local.storage.capacity", "1000000000");
+ String available = getConfiguredProperty("local.storage.avail", "10000000");
return new StoragePoolInfo(uuid, hostIp, localStoragePath, localStoragePath, StoragePoolType.Filesystem, Long.parseLong(capacity), Long.parseLong(available));
@@ -151,8 +151,9 @@ public class DummyResource implements ServerResource {
final List<Object> info = getHostInfo();
- final StartupRoutingCommand cmd = new StartupRoutingCommand((Integer)info.get(0), (Long)info.get(1), (Long)info.get(2), (Long)info.get(4), (String)info.get(3),
- HypervisorType.KVM, RouterPrivateIpStrategy.HostLocal, changes, null);
+ final StartupRoutingCommand cmd =
+ new StartupRoutingCommand((Integer)info.get(0), (Long)info.get(1), (Long)info.get(2), (Long)info.get(4), (String)info.get(3), HypervisorType.KVM,
+ RouterPrivateIpStrategy.HostLocal, changes, null);
fillNetworkInformation(cmd);
cmd.getHostDetails().putAll(getVersionStrings());
cmd.setCluster(getConfiguredProperty("cluster", "1"));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java b/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
index baba89d..edfb0aa 100644
--- a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
+++ b/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
@@ -23,7 +23,6 @@ import org.apache.cloudstack.api.InternalIdentity;
import com.cloud.network.rules.FirewallRule;
import com.cloud.network.rules.FirewallRule.State;
-import com.cloud.network.rules.FirewallRule.TrafficType;
import com.cloud.utils.net.NetUtils;
/**
@@ -60,8 +59,8 @@ public class FirewallRuleTO implements InternalIdentity {
protected FirewallRuleTO() {
}
- public FirewallRuleTO(long id, String srcIp, String protocol, Integer srcPortStart, Integer srcPortEnd, boolean revoked, boolean alreadyAdded, FirewallRule.Purpose purpose,
- List<String> sourceCidr, Integer icmpType, Integer icmpCode) {
+ public FirewallRuleTO(long id, String srcIp, String protocol, Integer srcPortStart, Integer srcPortEnd, boolean revoked, boolean alreadyAdded,
+ FirewallRule.Purpose purpose, List<String> sourceCidr, Integer icmpType, Integer icmpCode) {
this(id, null, srcIp, protocol, srcPortStart, srcPortEnd, revoked, alreadyAdded, purpose, sourceCidr, icmpType, icmpCode);
}
@@ -157,7 +156,8 @@ public class FirewallRuleTO implements InternalIdentity {
this.trafficType = trafficType;
}
- public FirewallRuleTO(FirewallRule rule, String srcVlanTag, String srcIp, FirewallRule.Purpose purpose, FirewallRule.TrafficType trafficType, boolean defaultEgressPolicy) {
+ public FirewallRuleTO(FirewallRule rule, String srcVlanTag, String srcIp, FirewallRule.Purpose purpose, FirewallRule.TrafficType trafficType,
+ boolean defaultEgressPolicy) {
this(rule.getId(),
srcVlanTag,
srcIp,
@@ -213,6 +213,7 @@ public class FirewallRuleTO implements InternalIdentity {
return trafficType;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/agent/api/to/LoadBalancerTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/LoadBalancerTO.java b/api/src/com/cloud/agent/api/to/LoadBalancerTO.java
index 777e507..aa979e5 100644
--- a/api/src/com/cloud/agent/api/to/LoadBalancerTO.java
+++ b/api/src/com/cloud/agent/api/to/LoadBalancerTO.java
@@ -31,8 +31,8 @@ import com.cloud.network.lb.LoadBalancingRule.LbAutoScaleVmProfile;
import com.cloud.network.lb.LoadBalancingRule.LbCondition;
import com.cloud.network.lb.LoadBalancingRule.LbDestination;
import com.cloud.network.lb.LoadBalancingRule.LbHealthCheckPolicy;
-import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy;
import com.cloud.network.lb.LoadBalancingRule.LbSslCert;
+import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy;
import com.cloud.utils.Pair;
public class LoadBalancerTO {
@@ -83,7 +83,8 @@ public class LoadBalancerTO {
}
public LoadBalancerTO(String id, String srcIp, int srcPort, String protocol, String algorithm, boolean revoked, boolean alreadyAdded, boolean inline,
- List<LbDestination> arg_destinations, List<LbStickinessPolicy> stickinessPolicies, List<LbHealthCheckPolicy> healthCheckPolicies, LbSslCert sslCert, String lbProtocol) {
+ List<LbDestination> arg_destinations, List<LbStickinessPolicy> stickinessPolicies, List<LbHealthCheckPolicy> healthCheckPolicies, LbSslCert sslCert,
+ String lbProtocol) {
this(id, srcIp, srcPort, protocol, algorithm, revoked, alreadyAdded, inline, arg_destinations);
this.stickinessPolicies = null;
this.healthCheckPolicies = null;
@@ -106,8 +107,9 @@ public class LoadBalancerTO {
this.healthCheckPolicies = new HealthCheckPolicyTO[MAX_HEALTHCHECK_POLICIES];
int index = 0;
for (LbHealthCheckPolicy hcp : healthCheckPolicies) {
- this.healthCheckPolicies[0] = new HealthCheckPolicyTO(hcp.getpingpath(), hcp.getDescription(), hcp.getResponseTime(), hcp.getHealthcheckInterval(),
- hcp.getHealthcheckThresshold(), hcp.getUnhealthThresshold(), hcp.isRevoked());
+ this.healthCheckPolicies[0] =
+ new HealthCheckPolicyTO(hcp.getpingpath(), hcp.getDescription(), hcp.getResponseTime(), hcp.getHealthcheckInterval(), hcp.getHealthcheckThresshold(),
+ hcp.getUnhealthThresshold(), hcp.isRevoked());
index++;
if (index == MAX_HEALTHCHECK_POLICIES)
break;
@@ -215,7 +217,8 @@ public class LoadBalancerTO {
private int unhealthThresshold;
private boolean revoke = false;
- public HealthCheckPolicyTO(String pingPath, String description, int responseTime, int healthcheckInterval, int healthcheckThresshold, int unhealthThresshold, boolean revoke) {
+ public HealthCheckPolicyTO(String pingPath, String description, int responseTime, int healthcheckInterval, int healthcheckThresshold, int unhealthThresshold,
+ boolean revoke) {
this.description = description;
this.pingPath = pingPath;
@@ -411,8 +414,9 @@ public class LoadBalancerTO {
private final String vmName;
private final String networkId;
- public AutoScaleVmProfileTO(String zoneId, String domainId, String cloudStackApiUrl, String autoScaleUserApiKey, String autoScaleUserSecretKey, String serviceOfferingId,
- String templateId, String vmName, String networkId, String otherDeployParams, List<Pair<String, String>> counterParamList, Integer destroyVmGraceperiod) {
+ public AutoScaleVmProfileTO(String zoneId, String domainId, String cloudStackApiUrl, String autoScaleUserApiKey, String autoScaleUserSecretKey,
+ String serviceOfferingId, String templateId, String vmName, String networkId, String otherDeployParams, List<Pair<String, String>> counterParamList,
+ Integer destroyVmGraceperiod) {
this.zoneId = zoneId;
this.domainId = domainId;
this.serviceOfferingId = serviceOfferingId;
@@ -487,8 +491,8 @@ public class LoadBalancerTO {
private final String state;
private final String currentState;
- AutoScaleVmGroupTO(String uuid, int minMembers, int maxMembers, int memberPort, int interval, List<AutoScalePolicyTO> policies, AutoScaleVmProfileTO profile, String state,
- String currentState) {
+ AutoScaleVmGroupTO(String uuid, int minMembers, int maxMembers, int memberPort, int interval, List<AutoScalePolicyTO> policies, AutoScaleVmProfileTO profile,
+ String state, String currentState) {
this.uuid = uuid;
this.minMembers = minMembers;
this.maxMembers = maxMembers;
@@ -551,20 +555,21 @@ public class LoadBalancerTO {
conditionTOs.add(conditionTO);
}
AutoScalePolicy autoScalePolicy = lbAutoScalePolicy.getPolicy();
- autoScalePolicyTOs.add(new AutoScalePolicyTO(autoScalePolicy.getId(), autoScalePolicy.getDuration(), autoScalePolicy.getQuietTime(), autoScalePolicy.getAction(),
- conditionTOs, lbAutoScalePolicy.isRevoked()));
+ autoScalePolicyTOs.add(new AutoScalePolicyTO(autoScalePolicy.getId(), autoScalePolicy.getDuration(), autoScalePolicy.getQuietTime(),
+ autoScalePolicy.getAction(), conditionTOs, lbAutoScalePolicy.isRevoked()));
}
LbAutoScaleVmProfile lbAutoScaleVmProfile = lbAutoScaleVmGroup.getProfile();
AutoScaleVmProfile autoScaleVmProfile = lbAutoScaleVmProfile.getProfile();
- AutoScaleVmProfileTO autoScaleVmProfileTO = new AutoScaleVmProfileTO(lbAutoScaleVmProfile.getZoneId(), lbAutoScaleVmProfile.getDomainId(), lbAutoScaleVmProfile.getCsUrl(),
- lbAutoScaleVmProfile.getAutoScaleUserApiKey(), lbAutoScaleVmProfile.getAutoScaleUserSecretKey(), lbAutoScaleVmProfile.getServiceOfferingId(),
- lbAutoScaleVmProfile.getTemplateId(), lbAutoScaleVmProfile.getVmName(), lbAutoScaleVmProfile.getNetworkId(), autoScaleVmProfile.getOtherDeployParams(),
- autoScaleVmProfile.getCounterParams(), autoScaleVmProfile.getDestroyVmGraceperiod());
+ AutoScaleVmProfileTO autoScaleVmProfileTO =
+ new AutoScaleVmProfileTO(lbAutoScaleVmProfile.getZoneId(), lbAutoScaleVmProfile.getDomainId(), lbAutoScaleVmProfile.getCsUrl(),
+ lbAutoScaleVmProfile.getAutoScaleUserApiKey(), lbAutoScaleVmProfile.getAutoScaleUserSecretKey(), lbAutoScaleVmProfile.getServiceOfferingId(),
+ lbAutoScaleVmProfile.getTemplateId(), lbAutoScaleVmProfile.getVmName(), lbAutoScaleVmProfile.getNetworkId(), autoScaleVmProfile.getOtherDeployParams(),
+ autoScaleVmProfile.getCounterParams(), autoScaleVmProfile.getDestroyVmGraceperiod());
AutoScaleVmGroup autoScaleVmGroup = lbAutoScaleVmGroup.getVmGroup();
- autoScaleVmGroupTO = new AutoScaleVmGroupTO(autoScaleVmGroup.getUuid(), autoScaleVmGroup.getMinMembers(), autoScaleVmGroup.getMaxMembers(),
- autoScaleVmGroup.getMemberPort(), autoScaleVmGroup.getInterval(), autoScalePolicyTOs, autoScaleVmProfileTO, autoScaleVmGroup.getState(),
- lbAutoScaleVmGroup.getCurrentState());
+ autoScaleVmGroupTO =
+ new AutoScaleVmGroupTO(autoScaleVmGroup.getUuid(), autoScaleVmGroup.getMinMembers(), autoScaleVmGroup.getMaxMembers(), autoScaleVmGroup.getMemberPort(),
+ autoScaleVmGroup.getInterval(), autoScalePolicyTOs, autoScaleVmProfileTO, autoScaleVmGroup.getState(), lbAutoScaleVmGroup.getCurrentState());
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/agent/api/to/NetworkACLTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/NetworkACLTO.java b/api/src/com/cloud/agent/api/to/NetworkACLTO.java
index fc7aac4..3d80079 100644
--- a/api/src/com/cloud/agent/api/to/NetworkACLTO.java
+++ b/api/src/com/cloud/agent/api/to/NetworkACLTO.java
@@ -20,10 +20,10 @@ package com.cloud.agent.api.to;
import java.util.ArrayList;
import java.util.List;
-import com.cloud.network.vpc.NetworkACLItem;
-import com.cloud.network.vpc.NetworkACLItem.TrafficType;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.network.vpc.NetworkACLItem;
+import com.cloud.network.vpc.NetworkACLItem.TrafficType;
import com.cloud.utils.net.NetUtils;
public class NetworkACLTO implements InternalIdentity {
@@ -95,6 +95,7 @@ public class NetworkACLTO implements InternalIdentity {
rule.getNumber());
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java b/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
index 1310734..76d6d95 100644
--- a/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
+++ b/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
@@ -39,8 +39,8 @@ public class PortForwardingRuleTO extends FirewallRuleTO {
this.dstPortRange = new int[] {rule.getDestinationPortStart(), rule.getDestinationPortEnd()};
}
- public PortForwardingRuleTO(long id, String srcIp, int srcPortStart, int srcPortEnd, String dstIp, int dstPortStart, int dstPortEnd, String protocol, boolean revoked,
- boolean alreadyAdded) {
+ public PortForwardingRuleTO(long id, String srcIp, int srcPortStart, int srcPortEnd, String dstIp, int dstPortStart, int dstPortEnd, String protocol,
+ boolean revoked, boolean alreadyAdded) {
super(id, null, srcIp, protocol, srcPortStart, srcPortEnd, revoked, alreadyAdded, FirewallRule.Purpose.PortForwarding, null, 0, 0);
this.dstIp = dstIp;
this.dstPortRange = new int[] {dstPortStart, dstPortEnd};
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/agent/api/to/S3TO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/S3TO.java b/api/src/com/cloud/agent/api/to/S3TO.java
index 700d998..f64fe35 100644
--- a/api/src/com/cloud/agent/api/to/S3TO.java
+++ b/api/src/com/cloud/agent/api/to/S3TO.java
@@ -47,8 +47,9 @@ public final class S3TO implements S3Utils.ClientOptions, DataStoreTO {
}
- public S3TO(final Long id, final String uuid, final String accessKey, final String secretKey, final String endPoint, final String bucketName, final Boolean httpsFlag,
- final Integer connectionTimeout, final Integer maxErrorRetry, final Integer socketTimeout, final Date created, final boolean enableRRS, final long maxUploadSize) {
+ public S3TO(final Long id, final String uuid, final String accessKey, final String secretKey, final String endPoint, final String bucketName,
+ final Boolean httpsFlag, final Integer connectionTimeout, final Integer maxErrorRetry, final Integer socketTimeout, final Date created,
+ final boolean enableRRS, final long maxUploadSize) {
super();
@@ -158,6 +159,7 @@ public final class S3TO implements S3Utils.ClientOptions, DataStoreTO {
this.id = id;
}
+ @Override
public String getUuid() {
return this.uuid;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/agent/api/to/SwiftTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/SwiftTO.java b/api/src/com/cloud/agent/api/to/SwiftTO.java
index 5823192..3b76dad 100644
--- a/api/src/com/cloud/agent/api/to/SwiftTO.java
+++ b/api/src/com/cloud/agent/api/to/SwiftTO.java
@@ -42,6 +42,7 @@ public class SwiftTO implements DataStoreTO, SwiftUtil.SwiftClientCfg {
return id;
}
+ @Override
public String getUrl() {
return url;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/agent/api/to/TemplateTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/TemplateTO.java b/api/src/com/cloud/agent/api/to/TemplateTO.java
index 45fa57b..9d22af8 100644
--- a/api/src/com/cloud/agent/api/to/TemplateTO.java
+++ b/api/src/com/cloud/agent/api/to/TemplateTO.java
@@ -35,6 +35,7 @@ public class TemplateTO implements InternalIdentity {
this.format = template.getFormat();
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/agent/api/to/VirtualMachineTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/VirtualMachineTO.java b/api/src/com/cloud/agent/api/to/VirtualMachineTO.java
index 4b5b35c..bed3e1d 100644
--- a/api/src/com/cloud/agent/api/to/VirtualMachineTO.java
+++ b/api/src/com/cloud/agent/api/to/VirtualMachineTO.java
@@ -61,8 +61,8 @@ public class VirtualMachineTO {
DiskTO[] disks;
NicTO[] nics;
- public VirtualMachineTO(long id, String instanceName, VirtualMachine.Type type, int cpus, Integer speed, long minRam, long maxRam, BootloaderType bootloader, String os,
- boolean enableHA, boolean limitCpuUse, String vncPassword) {
+ public VirtualMachineTO(long id, String instanceName, VirtualMachine.Type type, int cpus, Integer speed, long minRam, long maxRam, BootloaderType bootloader,
+ String os, boolean enableHA, boolean limitCpuUse, String vncPassword) {
this.id = id;
this.name = instanceName;
this.type = type;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/agent/api/to/VolumeTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/VolumeTO.java b/api/src/com/cloud/agent/api/to/VolumeTO.java
index b2df439..c9bb2f9 100644
--- a/api/src/com/cloud/agent/api/to/VolumeTO.java
+++ b/api/src/com/cloud/agent/api/to/VolumeTO.java
@@ -92,6 +92,7 @@ public class VolumeTO implements InternalIdentity {
this.deviceId = id;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/configuration/ConfigurationService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/configuration/ConfigurationService.java b/api/src/com/cloud/configuration/ConfigurationService.java
index 32f2247..50474de 100644
--- a/api/src/com/cloud/configuration/ConfigurationService.java
+++ b/api/src/com/cloud/configuration/ConfigurationService.java
@@ -18,8 +18,6 @@ package com.cloud.configuration;
import java.util.List;
-import javax.naming.NamingException;
-
import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
import org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd;
import org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/dc/DedicatedResources.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/dc/DedicatedResources.java b/api/src/com/cloud/dc/DedicatedResources.java
index ed351fd..63188ca 100755
--- a/api/src/com/cloud/dc/DedicatedResources.java
+++ b/api/src/com/cloud/dc/DedicatedResources.java
@@ -21,6 +21,7 @@ import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
public interface DedicatedResources extends InfrastructureEntity, InternalIdentity, Identity {
+ @Override
long getId();
Long getDataCenterId();
@@ -35,6 +36,7 @@ public interface DedicatedResources extends InfrastructureEntity, InternalIdenti
Long getAccountId();
+ @Override
String getUuid();
long getAffinityGroupId();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/deploy/DeploymentClusterPlanner.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/deploy/DeploymentClusterPlanner.java b/api/src/com/cloud/deploy/DeploymentClusterPlanner.java
index a9fdb79..6c09a6d 100644
--- a/api/src/com/cloud/deploy/DeploymentClusterPlanner.java
+++ b/api/src/com/cloud/deploy/DeploymentClusterPlanner.java
@@ -18,9 +18,10 @@ package com.cloud.deploy;
import java.util.List;
+import org.apache.cloudstack.framework.config.ConfigKey;
+
import com.cloud.exception.InsufficientServerCapacityException;
import com.cloud.vm.VirtualMachineProfile;
-import org.apache.cloudstack.framework.config.ConfigKey;
/**
*/
@@ -29,20 +30,22 @@ public interface DeploymentClusterPlanner extends DeploymentPlanner {
static final String ClusterCPUCapacityDisableThresholdCK = "cluster.cpu.allocated.capacity.disablethreshold";
static final String ClusterMemoryCapacityDisableThresholdCK = "cluster.memory.allocated.capacity.disablethreshold";
- static final ConfigKey<Float> ClusterCPUCapacityDisableThreshold = new ConfigKey<Float>(
- Float.class,
- ClusterCPUCapacityDisableThresholdCK,
- "Alert",
- "0.85",
- "Percentage (as a value between 0 and 1) of cpu utilization above which allocators will disable using the cluster for low cpu available. Keep the corresponding notification threshold lower than this to be notified beforehand.",
- true, ConfigKey.Scope.Cluster, null);
- static final ConfigKey<Float> ClusterMemoryCapacityDisableThreshold = new ConfigKey<Float>(
- Float.class,
- ClusterMemoryCapacityDisableThresholdCK,
- "Alert",
- "0.85",
- "Percentage (as a value between 0 and 1) of memory utilization above which allocators will disable using the cluster for low memory available. Keep the corresponding notification threshold lower than this to be notified beforehand.",
- true, ConfigKey.Scope.Cluster, null);
+ static final ConfigKey<Float> ClusterCPUCapacityDisableThreshold =
+ new ConfigKey<Float>(
+ Float.class,
+ ClusterCPUCapacityDisableThresholdCK,
+ "Alert",
+ "0.85",
+ "Percentage (as a value between 0 and 1) of cpu utilization above which allocators will disable using the cluster for low cpu available. Keep the corresponding notification threshold lower than this to be notified beforehand.",
+ true, ConfigKey.Scope.Cluster, null);
+ static final ConfigKey<Float> ClusterMemoryCapacityDisableThreshold =
+ new ConfigKey<Float>(
+ Float.class,
+ ClusterMemoryCapacityDisableThresholdCK,
+ "Alert",
+ "0.85",
+ "Percentage (as a value between 0 and 1) of memory utilization above which allocators will disable using the cluster for low memory available. Keep the corresponding notification threshold lower than this to be notified beforehand.",
+ true, ConfigKey.Scope.Cluster, null);
/**
* This is called to determine list of possible clusters where a virtual
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/domain/Domain.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/domain/Domain.java b/api/src/com/cloud/domain/Domain.java
index 612ecd6..c4755d7 100644
--- a/api/src/com/cloud/domain/Domain.java
+++ b/api/src/com/cloud/domain/Domain.java
@@ -60,6 +60,7 @@ public interface Domain extends OwnedBy, Identity, InternalIdentity {
String getNetworkDomain();
+ @Override
public String getUuid();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/event/ActionEvents.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/event/ActionEvents.java b/api/src/com/cloud/event/ActionEvents.java
index db535b6..24cc095 100644
--- a/api/src/com/cloud/event/ActionEvents.java
+++ b/api/src/com/cloud/event/ActionEvents.java
@@ -18,8 +18,9 @@
*/
package com.cloud.event;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/event/UsageEvent.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/event/UsageEvent.java b/api/src/com/cloud/event/UsageEvent.java
index 9e0952c..3921e70 100644
--- a/api/src/com/cloud/event/UsageEvent.java
+++ b/api/src/com/cloud/event/UsageEvent.java
@@ -16,10 +16,10 @@
// under the License.
package com.cloud.event;
-import org.apache.cloudstack.api.InternalIdentity;
-
import java.util.Date;
+import org.apache.cloudstack.api.InternalIdentity;
+
public interface UsageEvent extends InternalIdentity {
String getType();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/exception/AgentControlChannelException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/AgentControlChannelException.java b/api/src/com/cloud/exception/AgentControlChannelException.java
index ea3cafb..65e8204 100644
--- a/api/src/com/cloud/exception/AgentControlChannelException.java
+++ b/api/src/com/cloud/exception/AgentControlChannelException.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.exception;
-import com.cloud.exception.CloudException;
-
public class AgentControlChannelException extends CloudException {
private static final long serialVersionUID = -310647782960500466L;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/host/Host.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/host/Host.java b/api/src/com/cloud/host/Host.java
index 3f32b68..9d81125 100755
--- a/api/src/com/cloud/host/Host.java
+++ b/api/src/com/cloud/host/Host.java
@@ -30,23 +30,10 @@ import com.cloud.utils.fsm.StateObject;
*/
public interface Host extends StateObject<Status>, Identity, InternalIdentity {
public enum Type {
- Storage(false),
- Routing(false),
- SecondaryStorage(false),
- SecondaryStorageCmdExecutor(false),
- ConsoleProxy(true),
- ExternalFirewall(false),
- ExternalLoadBalancer(false),
- ExternalVirtualSwitchSupervisor(false),
- PxeServer(false),
- BaremetalPxe(false),
- BaremetalDhcp(false),
- TrafficMonitor(false),
-
- ExternalDhcp(false),
- SecondaryStorageVM(true),
- LocalSecondaryStorage(false),
- L2Networking(false);
+ Storage(false), Routing(false), SecondaryStorage(false), SecondaryStorageCmdExecutor(false), ConsoleProxy(true), ExternalFirewall(false), ExternalLoadBalancer(
+ false), ExternalVirtualSwitchSupervisor(false), PxeServer(false), BaremetalPxe(false), BaremetalDhcp(false), TrafficMonitor(false),
+
+ ExternalDhcp(false), SecondaryStorageVM(true), LocalSecondaryStorage(false), L2Networking(false);
boolean _virtual;
private Type(boolean virtual) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/host/Status.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/host/Status.java b/api/src/com/cloud/host/Status.java
index fd136c9..2a8bf9e 100755
--- a/api/src/com/cloud/host/Status.java
+++ b/api/src/com/cloud/host/Status.java
@@ -23,10 +23,15 @@ import com.cloud.utils.fsm.NoTransitionException;
import com.cloud.utils.fsm.StateMachine2;
public enum Status {
- Creating(true, false, false), Connecting(true, false, false), Up(true, false, false), Down(true, true, true), Disconnected(true, true, true), Alert(true, true, true), Removed(
- true,
- false,
- true), Error(true, false, true), Rebalancing(true, false, true);
+ Creating(true, false, false),
+ Connecting(true, false, false),
+ Up(true, false, false),
+ Down(true, true, true),
+ Disconnected(true, true, true),
+ Alert(true, true, true),
+ Removed(true, false, true),
+ Error(true, false, true),
+ Rebalancing(true, false, true);
private final boolean updateManagementServer;
private final boolean checkManagementServer;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/GuestVlan.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/GuestVlan.java b/api/src/com/cloud/network/GuestVlan.java
index a5173d8..4597192 100644
--- a/api/src/com/cloud/network/GuestVlan.java
+++ b/api/src/com/cloud/network/GuestVlan.java
@@ -21,6 +21,7 @@ import org.apache.cloudstack.api.InternalIdentity;
public interface GuestVlan extends InternalIdentity, Identity {
+ @Override
public long getId();
public long getAccountId();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/MonitoringService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/MonitoringService.java b/api/src/com/cloud/network/MonitoringService.java
index 2024204..63f2ec1 100644
--- a/api/src/com/cloud/network/MonitoringService.java
+++ b/api/src/com/cloud/network/MonitoringService.java
@@ -32,6 +32,7 @@ public interface MonitoringService extends ControlledEntity, Identity, InternalI
Dhcp, LoadBalancing, Ssh, Webserver,
}
+ @Override
long getId();
String getService();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/NetworkMigrationResponder.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/NetworkMigrationResponder.java b/api/src/com/cloud/network/NetworkMigrationResponder.java
index 2a99036..659b7df 100644
--- a/api/src/com/cloud/network/NetworkMigrationResponder.java
+++ b/api/src/com/cloud/network/NetworkMigrationResponder.java
@@ -19,7 +19,6 @@ package com.cloud.network;
import com.cloud.deploy.DeployDestination;
import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
-import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
/**
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/NetworkService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/NetworkService.java b/api/src/com/cloud/network/NetworkService.java
index ceb9f41..57e95c9 100755
--- a/api/src/com/cloud/network/NetworkService.java
+++ b/api/src/com/cloud/network/NetworkService.java
@@ -32,7 +32,6 @@ import com.cloud.exception.InsufficientAddressCapacityException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.GuestVlan;
import com.cloud.network.Network.Service;
import com.cloud.network.Networks.TrafficType;
import com.cloud.offering.NetworkOffering;
@@ -51,12 +50,13 @@ public interface NetworkService {
List<? extends Network> getIsolatedNetworksOwnedByAccountInZone(long zoneId, Account owner);
- IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId) throws ResourceAllocationException, InsufficientAddressCapacityException, ConcurrentOperationException;
+ IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId) throws ResourceAllocationException, InsufficientAddressCapacityException,
+ ConcurrentOperationException;
boolean releaseIpAddress(long ipAddressId) throws InsufficientAddressCapacityException;
- IpAddress allocatePortableIP(Account ipOwner, int regionId, Long zoneId, Long networkId, Long vpcId) throws ResourceAllocationException, InsufficientAddressCapacityException,
- ConcurrentOperationException;
+ IpAddress allocatePortableIP(Account ipOwner, int regionId, Long zoneId, Long networkId, Long vpcId) throws ResourceAllocationException,
+ InsufficientAddressCapacityException, ConcurrentOperationException;
boolean releasePortableIpAddress(long ipAddressId);
@@ -90,9 +90,11 @@ public interface NetworkService {
List<? extends Service> listNetworkServices(String providerName);
- PhysicalNetworkServiceProvider addProviderToPhysicalNetwork(Long physicalNetworkId, String providerName, Long destinationPhysicalNetworkId, List<String> enabledServices);
+ PhysicalNetworkServiceProvider addProviderToPhysicalNetwork(Long physicalNetworkId, String providerName, Long destinationPhysicalNetworkId,
+ List<String> enabledServices);
- Pair<List<? extends PhysicalNetworkServiceProvider>, Integer> listNetworkServiceProviders(Long physicalNetworkId, String name, String state, Long startIndex, Long pageSize);
+ Pair<List<? extends PhysicalNetworkServiceProvider>, Integer> listNetworkServiceProviders(Long physicalNetworkId, String name, String state, Long startIndex,
+ Long pageSize);
PhysicalNetworkServiceProvider updateNetworkServiceProvider(Long id, String state, List<String> enabledServices);
@@ -161,8 +163,9 @@ public interface NetworkService {
* @throws ConcurrentOperationException
* @throws ResourceAllocationException
*/
- Network createPrivateNetwork(String networkName, String displayText, long physicalNetworkId, String broadcastUri, String startIp, String endIP, String gateway, String netmask,
- long networkOwnerId, Long vpcId, Boolean sourceNat, Long networkOfferingId) throws ResourceAllocationException, ConcurrentOperationException, InsufficientCapacityException;
+ Network createPrivateNetwork(String networkName, String displayText, long physicalNetworkId, String broadcastUri, String startIp, String endIP, String gateway,
+ String netmask, long networkOwnerId, Long vpcId, Boolean sourceNat, Long networkOfferingId) throws ResourceAllocationException, ConcurrentOperationException,
+ InsufficientCapacityException;
/* Requests an IP address for the guest nic */
NicSecondaryIp allocateSecondaryGuestIP(Account account, long zoneId, Long nicId, Long networkId, String ipaddress) throws InsufficientAddressCapacityException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/NetworkUsageService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/NetworkUsageService.java b/api/src/com/cloud/network/NetworkUsageService.java
index 1cfea24..71a2f49 100644
--- a/api/src/com/cloud/network/NetworkUsageService.java
+++ b/api/src/com/cloud/network/NetworkUsageService.java
@@ -18,12 +18,11 @@ package com.cloud.network;
import java.util.List;
-import com.cloud.host.Host;
-
import org.apache.cloudstack.api.command.admin.usage.AddTrafficMonitorCmd;
import org.apache.cloudstack.api.command.admin.usage.DeleteTrafficMonitorCmd;
import org.apache.cloudstack.api.command.admin.usage.ListTrafficMonitorsCmd;
-import org.apache.cloudstack.api.response.TrafficMonitorResponse;
+
+import com.cloud.host.Host;
import com.cloud.utils.component.Manager;
public interface NetworkUsageService extends Manager {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/PhysicalNetwork.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/PhysicalNetwork.java b/api/src/com/cloud/network/PhysicalNetwork.java
index 08b28ae..cfa236d 100644
--- a/api/src/com/cloud/network/PhysicalNetwork.java
+++ b/api/src/com/cloud/network/PhysicalNetwork.java
@@ -18,10 +18,11 @@ package com.cloud.network;
import java.util.List;
-import com.cloud.utils.Pair;
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.utils.Pair;
+
/**
*
*/
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java b/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java
index bbf137c..d3c8193 100644
--- a/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java
+++ b/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java
@@ -31,6 +31,7 @@ public interface PhysicalNetworkServiceProvider extends InternalIdentity {
Disabled, Enabled, Shutdown;
}
+ @Override
long getId();
State getState();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/Site2SiteVpnConnection.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/Site2SiteVpnConnection.java b/api/src/com/cloud/network/Site2SiteVpnConnection.java
index bb09f70..ad1a982 100644
--- a/api/src/com/cloud/network/Site2SiteVpnConnection.java
+++ b/api/src/com/cloud/network/Site2SiteVpnConnection.java
@@ -26,6 +26,7 @@ public interface Site2SiteVpnConnection extends ControlledEntity, InternalIdenti
Pending, Connected, Disconnected, Error,
}
+ @Override
public long getId();
public String getUuid();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/VirtualNetworkApplianceService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/VirtualNetworkApplianceService.java b/api/src/com/cloud/network/VirtualNetworkApplianceService.java
index ec8dba7..96162f3 100644
--- a/api/src/com/cloud/network/VirtualNetworkApplianceService.java
+++ b/api/src/com/cloud/network/VirtualNetworkApplianceService.java
@@ -16,16 +16,16 @@
// under the License.
package com.cloud.network;
+import java.util.List;
+
import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd;
+import org.apache.cloudstack.api.command.admin.router.UpgradeRouterTemplateCmd;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.router.VirtualRouter;
import com.cloud.user.Account;
-import org.apache.cloudstack.api.command.admin.router.UpgradeRouterTemplateCmd;
-
-import java.util.List;
public interface VirtualNetworkApplianceService {
/**
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/as/AutoScalePolicy.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/as/AutoScalePolicy.java b/api/src/com/cloud/network/as/AutoScalePolicy.java
index 7f94f35..434220a 100644
--- a/api/src/com/cloud/network/as/AutoScalePolicy.java
+++ b/api/src/com/cloud/network/as/AutoScalePolicy.java
@@ -22,6 +22,7 @@ import org.apache.cloudstack.api.InternalIdentity;
public interface AutoScalePolicy extends ControlledEntity, InternalIdentity {
+ @Override
long getId();
String getUuid();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/as/AutoScaleVmGroup.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/as/AutoScaleVmGroup.java b/api/src/com/cloud/network/as/AutoScaleVmGroup.java
index cc0a3da..3e07fe4 100644
--- a/api/src/com/cloud/network/as/AutoScaleVmGroup.java
+++ b/api/src/com/cloud/network/as/AutoScaleVmGroup.java
@@ -27,6 +27,7 @@ public interface AutoScaleVmGroup extends ControlledEntity, InternalIdentity {
String State_Enabled = "enabled";
String State_Disabled = "disabled";
+ @Override
long getId();
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/as/AutoScaleVmProfile.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/as/AutoScaleVmProfile.java b/api/src/com/cloud/network/as/AutoScaleVmProfile.java
index 9c6a0f2..0577080 100644
--- a/api/src/com/cloud/network/as/AutoScaleVmProfile.java
+++ b/api/src/com/cloud/network/as/AutoScaleVmProfile.java
@@ -29,6 +29,7 @@ import com.cloud.utils.Pair;
*/
public interface AutoScaleVmProfile extends ControlledEntity, InternalIdentity {
+ @Override
public long getId();
public String getUuid();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/element/DhcpServiceProvider.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/element/DhcpServiceProvider.java b/api/src/com/cloud/network/element/DhcpServiceProvider.java
index 2b91968..2bd6ebc 100644
--- a/api/src/com/cloud/network/element/DhcpServiceProvider.java
+++ b/api/src/com/cloud/network/element/DhcpServiceProvider.java
@@ -23,12 +23,11 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.Network;
import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
-import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
public interface DhcpServiceProvider extends NetworkElement {
- boolean addDhcpEntry(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException,
- InsufficientCapacityException, ResourceUnavailableException;
+ boolean addDhcpEntry(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context)
+ throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException;
boolean configDhcpSupportForSubnet(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context)
throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/element/NetworkACLServiceProvider.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/element/NetworkACLServiceProvider.java b/api/src/com/cloud/network/element/NetworkACLServiceProvider.java
index ed1f496..8c3243c 100644
--- a/api/src/com/cloud/network/element/NetworkACLServiceProvider.java
+++ b/api/src/com/cloud/network/element/NetworkACLServiceProvider.java
@@ -20,7 +20,6 @@ import java.util.List;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.Network;
-import com.cloud.network.rules.FirewallRule;
import com.cloud.network.vpc.NetworkACLItem;
public interface NetworkACLServiceProvider extends NetworkElement {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/element/NetworkElement.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/element/NetworkElement.java b/api/src/com/cloud/network/element/NetworkElement.java
index 5d4bda6..dda3a14 100644
--- a/api/src/com/cloud/network/element/NetworkElement.java
+++ b/api/src/com/cloud/network/element/NetworkElement.java
@@ -33,7 +33,6 @@ import com.cloud.offering.NetworkOffering;
import com.cloud.utils.component.Adapter;
import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
-import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
/**
@@ -84,7 +83,8 @@ public interface NetworkElement extends Adapter {
* @throws ConcurrentOperationException
* @throws ResourceUnavailableException
*/
- boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException;
+ boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException,
+ ResourceUnavailableException;
/**
* The network is being shutdown.
@@ -121,7 +121,8 @@ public interface NetworkElement extends Adapter {
* @throws ConcurrentOperationException
* @throws ResourceUnavailableException
*/
- boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException;
+ boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException,
+ ResourceUnavailableException;
/**
* This should return true if out of multiple services provided by this element, only some can be enabled. If all the services MUST be provided, this should return false.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/element/UserDataServiceProvider.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/element/UserDataServiceProvider.java b/api/src/com/cloud/network/element/UserDataServiceProvider.java
index eb80ede..ad485a5 100644
--- a/api/src/com/cloud/network/element/UserDataServiceProvider.java
+++ b/api/src/com/cloud/network/element/UserDataServiceProvider.java
@@ -23,7 +23,6 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.Network;
import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
-import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
public interface UserDataServiceProvider extends NetworkElement {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/guru/NetworkGuru.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/guru/NetworkGuru.java b/api/src/com/cloud/network/guru/NetworkGuru.java
index 01e3995..6c39285 100755
--- a/api/src/com/cloud/network/guru/NetworkGuru.java
+++ b/api/src/com/cloud/network/guru/NetworkGuru.java
@@ -108,7 +108,8 @@ public interface NetworkGuru extends Adapter {
* environment. At this time, the admin generally must be involved to
* allocate more resources before any more guest network can be implemented.
*/
- Network implement(Network network, NetworkOffering offering, DeployDestination destination, ReservationContext context) throws InsufficientVirtualNetworkCapcityException;
+ Network implement(Network network, NetworkOffering offering, DeployDestination destination, ReservationContext context)
+ throws InsufficientVirtualNetworkCapcityException;
/**
* Once a guest network has been designed, virtual machines can be
@@ -126,8 +127,8 @@ public interface NetworkGuru extends Adapter {
* @throws InsufficientAddressCapacityException if there are not addresses
* to be assigned.
*/
- NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException,
- ConcurrentOperationException;
+ NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException,
+ InsufficientAddressCapacityException, ConcurrentOperationException;
/**
* Once a guest network is implemented, then the virtual machine must
@@ -147,8 +148,8 @@ public interface NetworkGuru extends Adapter {
* @throws ConcurrentOperationException if there are multiple operations
* happening on this guest network or vm.
*/
- void reserve(NicProfile nic, Network network, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws InsufficientVirtualNetworkCapcityException,
- InsufficientAddressCapacityException, ConcurrentOperationException;
+ void reserve(NicProfile nic, Network network, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context)
+ throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, ConcurrentOperationException;
/**
* When a virtual machine is stopped, the NetworkGuru is informed via the
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/lb/CertService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/lb/CertService.java b/api/src/com/cloud/network/lb/CertService.java
index 5342a7e..e9219e0 100644
--- a/api/src/com/cloud/network/lb/CertService.java
+++ b/api/src/com/cloud/network/lb/CertService.java
@@ -16,13 +16,13 @@
// under the License.
package com.cloud.network.lb;
+import java.util.List;
+
import org.apache.cloudstack.api.command.user.loadbalancer.DeleteSslCertCmd;
import org.apache.cloudstack.api.command.user.loadbalancer.ListSslCertsCmd;
import org.apache.cloudstack.api.command.user.loadbalancer.UploadSslCertCmd;
import org.apache.cloudstack.api.response.SslCertResponse;
-import java.util.List;
-
public interface CertService {
public SslCertResponse uploadSslCert(UploadSslCertCmd certCmd);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/lb/LoadBalancingRule.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/lb/LoadBalancingRule.java b/api/src/com/cloud/network/lb/LoadBalancingRule.java
index b9d0cc2..4b2f9c4 100644
--- a/api/src/com/cloud/network/lb/LoadBalancingRule.java
+++ b/api/src/com/cloud/network/lb/LoadBalancingRule.java
@@ -39,8 +39,8 @@ public class LoadBalancingRule {
private LbSslCert sslCert;
private String lbProtocol;
- public LoadBalancingRule(LoadBalancer lb, List<LbDestination> destinations, List<LbStickinessPolicy> stickinessPolicies, List<LbHealthCheckPolicy> healthCheckPolicies,
- Ip sourceIp) {
+ public LoadBalancingRule(LoadBalancer lb, List<LbDestination> destinations, List<LbStickinessPolicy> stickinessPolicies,
+ List<LbHealthCheckPolicy> healthCheckPolicies, Ip sourceIp) {
this.lb = lb;
this.destinations = destinations;
this.stickinessPolicies = stickinessPolicies;
@@ -48,8 +48,8 @@ public class LoadBalancingRule {
this.sourceIp = sourceIp;
}
- public LoadBalancingRule(LoadBalancer lb, List<LbDestination> destinations, List<LbStickinessPolicy> stickinessPolicies, List<LbHealthCheckPolicy> healthCheckPolicies,
- Ip sourceIp, LbSslCert sslCert, String lbProtocol) {
+ public LoadBalancingRule(LoadBalancer lb, List<LbDestination> destinations, List<LbStickinessPolicy> stickinessPolicies,
+ List<LbHealthCheckPolicy> healthCheckPolicies, Ip sourceIp, LbSslCert sslCert, String lbProtocol) {
this.lb = lb;
this.destinations = destinations;
this.stickinessPolicies = stickinessPolicies;
@@ -196,7 +196,8 @@ public class LoadBalancingRule {
this(pingpath, description, responseTime, healthcheckInterval, healthcheckThresshold, unhealthThresshold, false);
}
- public LbHealthCheckPolicy(String pingpath, String description, int responseTime, int healthcheckInterval, int healthcheckThresshold, int unhealthThresshold, boolean revoke) {
+ public LbHealthCheckPolicy(String pingpath, String description, int responseTime, int healthcheckInterval, int healthcheckThresshold, int unhealthThresshold,
+ boolean revoke) {
this.pingpath = pingpath;
this.description = description;
this.responseTime = responseTime;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/lb/LoadBalancingRulesService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/lb/LoadBalancingRulesService.java b/api/src/com/cloud/network/lb/LoadBalancingRulesService.java
index a48d79a..e62b45c 100644
--- a/api/src/com/cloud/network/lb/LoadBalancingRulesService.java
+++ b/api/src/com/cloud/network/lb/LoadBalancingRulesService.java
@@ -49,8 +49,8 @@ public interface LoadBalancingRulesService {
* @return the newly created LoadBalancerVO if successful, null otherwise
* @throws InsufficientAddressCapacityException
*/
- LoadBalancer createPublicLoadBalancerRule(String xId, String name, String description, int srcPortStart, int srcPortEnd, int defPortStart, int defPortEnd, Long ipAddrId,
- String protocol, String algorithm, long networkId, long lbOwnerId, boolean openFirewall, String lbProtocol) throws NetworkRuleConflictException,
+ LoadBalancer createPublicLoadBalancerRule(String xId, String name, String description, int srcPortStart, int srcPortEnd, int defPortStart, int defPortEnd,
+ Long ipAddrId, String protocol, String algorithm, long networkId, long lbOwnerId, boolean openFirewall, String lbProtocol) throws NetworkRuleConflictException,
InsufficientAddressCapacityException;
LoadBalancer updateLoadBalancerRule(UpdateLoadBalancerRuleCmd cmd);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/rules/HealthCheckPolicy.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/rules/HealthCheckPolicy.java b/api/src/com/cloud/network/rules/HealthCheckPolicy.java
index 96bb282..6157bd4 100644
--- a/api/src/com/cloud/network/rules/HealthCheckPolicy.java
+++ b/api/src/com/cloud/network/rules/HealthCheckPolicy.java
@@ -16,9 +16,6 @@
// under the License.
package com.cloud.network.rules;
-import java.util.List;
-
-import com.cloud.utils.Pair;
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/rules/RulesService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/rules/RulesService.java b/api/src/com/cloud/network/rules/RulesService.java
index d073672..39329d5 100644
--- a/api/src/com/cloud/network/rules/RulesService.java
+++ b/api/src/com/cloud/network/rules/RulesService.java
@@ -28,8 +28,8 @@ import com.cloud.utils.Pair;
import com.cloud.utils.net.Ip;
public interface RulesService {
- Pair<List<? extends FirewallRule>, Integer> searchStaticNatRules(Long ipId, Long id, Long vmId, Long start, Long size, String accountName, Long domainId, Long projectId,
- boolean isRecursive, boolean listAll);
+ Pair<List<? extends FirewallRule>, Integer> searchStaticNatRules(Long ipId, Long id, Long vmId, Long start, Long size, String accountName, Long domainId,
+ Long projectId, boolean isRecursive, boolean listAll);
/**
* Creates a port forwarding rule between two ip addresses or between
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/security/SecurityGroupService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/security/SecurityGroupService.java b/api/src/com/cloud/network/security/SecurityGroupService.java
index 746cba1..1ee504f 100644
--- a/api/src/com/cloud/network/security/SecurityGroupService.java
+++ b/api/src/com/cloud/network/security/SecurityGroupService.java
@@ -24,7 +24,6 @@ import org.apache.cloudstack.api.command.user.securitygroup.CreateSecurityGroupC
import org.apache.cloudstack.api.command.user.securitygroup.DeleteSecurityGroupCmd;
import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupEgressCmd;
import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupIngressCmd;
-import org.apache.cloudstack.api.command.user.vm.AddIpToVmNicCmd;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/vpc/NetworkACL.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/NetworkACL.java b/api/src/com/cloud/network/vpc/NetworkACL.java
index bd73685..a97c57d 100644
--- a/api/src/com/cloud/network/vpc/NetworkACL.java
+++ b/api/src/com/cloud/network/vpc/NetworkACL.java
@@ -17,7 +17,6 @@
package com.cloud.network.vpc;
-import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.api.InternalIdentity;
public interface NetworkACL extends InternalIdentity {
@@ -30,6 +29,7 @@ public interface NetworkACL extends InternalIdentity {
Long getVpcId();
+ @Override
long getId();
String getName();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/vpc/NetworkACLItem.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/NetworkACLItem.java b/api/src/com/cloud/network/vpc/NetworkACLItem.java
index 78d9957..d8dd0fb 100644
--- a/api/src/com/cloud/network/vpc/NetworkACLItem.java
+++ b/api/src/com/cloud/network/vpc/NetworkACLItem.java
@@ -16,12 +16,10 @@
// under the License.
package com.cloud.network.vpc;
-import org.apache.cloudstack.acl.ControlledEntity;
-import org.apache.cloudstack.api.Identity;
-import org.apache.cloudstack.api.InternalIdentity;
-
import java.util.List;
+import org.apache.cloudstack.api.InternalIdentity;
+
public interface NetworkACLItem extends InternalIdentity {
String getUuid();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/vpc/NetworkACLService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/NetworkACLService.java b/api/src/com/cloud/network/vpc/NetworkACLService.java
index c9830af..56a2180 100644
--- a/api/src/com/cloud/network/vpc/NetworkACLService.java
+++ b/api/src/com/cloud/network/vpc/NetworkACLService.java
@@ -16,12 +16,13 @@
// under the License.
package com.cloud.network.vpc;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.utils.Pair;
+import java.util.List;
+
import org.apache.cloudstack.api.command.user.network.CreateNetworkACLCmd;
import org.apache.cloudstack.api.command.user.network.ListNetworkACLsCmd;
-import java.util.List;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.utils.Pair;
public interface NetworkACLService {
/**
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/vpc/VpcProvisioningService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/VpcProvisioningService.java b/api/src/com/cloud/network/vpc/VpcProvisioningService.java
index 8ab13cc..174b71f 100644
--- a/api/src/com/cloud/network/vpc/VpcProvisioningService.java
+++ b/api/src/com/cloud/network/vpc/VpcProvisioningService.java
@@ -23,10 +23,11 @@ public interface VpcProvisioningService {
public VpcOffering getVpcOffering(long vpcOfferingId);
- public VpcOffering createVpcOffering(String name, String displayText, List<String> supportedServices, Map<String, List<String>> serviceProviders, Long serviceOfferingId);
+ public VpcOffering createVpcOffering(String name, String displayText, List<String> supportedServices, Map<String, List<String>> serviceProviders,
+ Long serviceOfferingId);
- List<? extends VpcOffering> listVpcOfferings(Long id, String name, String displayText, List<String> supportedServicesStr, Boolean isDefault, String keyword, String state,
- Long startIndex, Long pageSizeVal);
+ List<? extends VpcOffering> listVpcOfferings(Long id, String name, String displayText, List<String> supportedServicesStr, Boolean isDefault, String keyword,
+ String state, Long startIndex, Long pageSizeVal);
/**
* @param offId
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/network/vpc/VpcService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/VpcService.java b/api/src/com/cloud/network/vpc/VpcService.java
index 8223ae6..e28f351 100644
--- a/api/src/com/cloud/network/vpc/VpcService.java
+++ b/api/src/com/cloud/network/vpc/VpcService.java
@@ -46,7 +46,8 @@ public interface VpcService {
* @return
* @throws ResourceAllocationException TODO
*/
- public Vpc createVpc(long zoneId, long vpcOffId, long vpcOwnerId, String vpcName, String displayText, String cidr, String networkDomain) throws ResourceAllocationException;
+ public Vpc createVpc(long zoneId, long vpcOffId, long vpcOwnerId, String vpcName, String displayText, String cidr, String networkDomain)
+ throws ResourceAllocationException;
/**
* Deletes a VPC
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/projects/Project.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/projects/Project.java b/api/src/com/cloud/projects/Project.java
index 9240930..5fff308 100644
--- a/api/src/com/cloud/projects/Project.java
+++ b/api/src/com/cloud/projects/Project.java
@@ -34,8 +34,10 @@ public interface Project extends PartOf, Identity, InternalIdentity {
String getDisplayText();
+ @Override
long getDomainId();
+ @Override
long getId();
Date getCreated();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java b/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
index 5e7e8cd..946c2f9 100644
--- a/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
+++ b/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
@@ -75,6 +75,7 @@ public interface GlobalLoadBalancerRule extends Identity, InternalIdentity, Cont
public int getRegion();
+ @Override
public long getAccountId();
public State getState();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java b/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java
index 708249a..ab6e6fb 100644
--- a/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java
+++ b/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java
@@ -17,11 +17,17 @@
package com.cloud.region.ha;
-import com.cloud.network.rules.LoadBalancer;
-import org.apache.cloudstack.api.command.user.region.ha.gslb.*;
-
import java.util.List;
+import org.apache.cloudstack.api.command.user.region.ha.gslb.AssignToGlobalLoadBalancerRuleCmd;
+import org.apache.cloudstack.api.command.user.region.ha.gslb.CreateGlobalLoadBalancerRuleCmd;
+import org.apache.cloudstack.api.command.user.region.ha.gslb.DeleteGlobalLoadBalancerRuleCmd;
+import org.apache.cloudstack.api.command.user.region.ha.gslb.ListGlobalLoadBalancerRuleCmd;
+import org.apache.cloudstack.api.command.user.region.ha.gslb.RemoveFromGlobalLoadBalancerRuleCmd;
+import org.apache.cloudstack.api.command.user.region.ha.gslb.UpdateGlobalLoadBalancerRuleCmd;
+
+import com.cloud.network.rules.LoadBalancer;
+
public interface GlobalLoadBalancingRulesService {
/*
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/resource/ResourceState.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/resource/ResourceState.java b/api/src/com/cloud/resource/ResourceState.java
index 6400251..5d2c962 100755
--- a/api/src/com/cloud/resource/ResourceState.java
+++ b/api/src/com/cloud/resource/ResourceState.java
@@ -25,9 +25,16 @@ public enum ResourceState {
Creating, Enabled, Disabled, PrepareForMaintenance, ErrorInMaintenance, Maintenance, Error;
public enum Event {
- InternalCreated("Resource is created"), Enable("Admin enables"), Disable("Admin disables"), AdminAskMaintenace("Admin asks to enter maintenance"), AdminCancelMaintenance(
- "Admin asks to cancel maintenance"), InternalEnterMaintenance("Resource enters maintenance"), UpdatePassword("Admin updates password of host"), UnableToMigrate(
- "Management server migrates VM failed"), Error("An internal error happened"), DeleteHost("Admin delete a host"),
+ InternalCreated("Resource is created"),
+ Enable("Admin enables"),
+ Disable("Admin disables"),
+ AdminAskMaintenace("Admin asks to enter maintenance"),
+ AdminCancelMaintenance("Admin asks to cancel maintenance"),
+ InternalEnterMaintenance("Resource enters maintenance"),
+ UpdatePassword("Admin updates password of host"),
+ UnableToMigrate("Management server migrates VM failed"),
+ Error("An internal error happened"),
+ DeleteHost("Admin delete a host"),
/*
* Below events don't cause resource state to change, they are merely
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/resource/UnableDeleteHostException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/resource/UnableDeleteHostException.java b/api/src/com/cloud/resource/UnableDeleteHostException.java
index bb372d6..8466dd4 100755
--- a/api/src/com/cloud/resource/UnableDeleteHostException.java
+++ b/api/src/com/cloud/resource/UnableDeleteHostException.java
@@ -16,8 +16,8 @@
// under the License.
package com.cloud.resource;
-import com.cloud.utils.SerialVersionUID;
import com.cloud.exception.CloudException;
+import com.cloud.utils.SerialVersionUID;
public class UnableDeleteHostException extends CloudException {
private static final long serialVersionUID = SerialVersionUID.UnableDeleteHostException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/server/ManagementService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java
index 65bc58b..ce62326 100755
--- a/api/src/com/cloud/server/ManagementService.java
+++ b/api/src/com/cloud/server/ManagementService.java
@@ -349,7 +349,8 @@ public interface ManagementService {
String[] listEventTypes();
- Pair<List<? extends HypervisorCapabilities>, Integer> listHypervisorCapabilities(Long id, HypervisorType hypervisorType, String keyword, Long startIndex, Long pageSizeVal);
+ Pair<List<? extends HypervisorCapabilities>, Integer> listHypervisorCapabilities(Long id, HypervisorType hypervisorType, String keyword, Long startIndex,
+ Long pageSizeVal);
HypervisorCapabilities updateHypervisorCapabilities(Long id, Long maxGuestsLimit, Boolean securityGroupEnabled);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/server/ResourceTag.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/server/ResourceTag.java b/api/src/com/cloud/server/ResourceTag.java
index 23c3432..000808d 100644
--- a/api/src/com/cloud/server/ResourceTag.java
+++ b/api/src/com/cloud/server/ResourceTag.java
@@ -24,27 +24,13 @@ public interface ResourceTag extends ControlledEntity, Identity, InternalIdentit
//FIXME - extract enum to another interface as its used both by resourceTags and resourceMetaData code
public enum ResourceObjectType {
- UserVm(true, true),
- Template(true, true),
- ISO(true, false),
- Volume(true, true),
- Snapshot(true, false),
- Network(true, true),
- Nic(false, true),
- LoadBalancer(true, true),
- PortForwardingRule(true, true),
- FirewallRule(true, true),
- SecurityGroup(true, false),
- PublicIpAddress(true, true),
- Project(true, false),
- Vpc(true, false),
- NetworkACL(true, false),
- StaticRoute(true, false),
- VMSnapshot(true, false),
- RemoteAccessVpn(true, true),
- Zone(false, true),
- ServiceOffering(false, true),
- Storage(false, true);
+ UserVm(true, true), Template(true, true), ISO(true, false), Volume(true, true), Snapshot(true, false), Network(true, true), Nic(false, true), LoadBalancer(
+ true,
+ true), PortForwardingRule(true, true), FirewallRule(true, true), SecurityGroup(true, false), PublicIpAddress(true, true), Project(true, false), Vpc(
+ true,
+ false), NetworkACL(true, false), StaticRoute(true, false), VMSnapshot(true, false), RemoteAccessVpn(true, true), Zone(false, true), ServiceOffering(
+ false,
+ true), Storage(false, true);
ResourceObjectType(boolean resourceTagsSupport, boolean resourceMetadataSupport) {
this.resourceTagsSupport = resourceTagsSupport;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/storage/Snapshot.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/Snapshot.java b/api/src/com/cloud/storage/Snapshot.java
index f175ac0..7f0168e 100644
--- a/api/src/com/cloud/storage/Snapshot.java
+++ b/api/src/com/cloud/storage/Snapshot.java
@@ -53,6 +53,7 @@ public interface Snapshot extends ControlledEntity, Identity, InternalIdentity,
//it's a state, user can't see the snapshot from ui, while the snapshot may still exist on the storage
Error;
+ @Override
public String toString() {
return this.name();
}
@@ -68,6 +69,7 @@ public interface Snapshot extends ControlledEntity, Identity, InternalIdentity,
public static final long MANUAL_POLICY_ID = 0L;
+ @Override
long getAccountId();
long getVolumeId();
@@ -78,6 +80,7 @@ public interface Snapshot extends ControlledEntity, Identity, InternalIdentity,
Type getRecurringType();
+ @Override
State getState();
HypervisorType getHypervisorType();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/storage/Storage.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/Storage.java b/api/src/com/cloud/storage/Storage.java
index f0e9931..f1868a7 100755
--- a/api/src/com/cloud/storage/Storage.java
+++ b/api/src/com/cloud/storage/Storage.java
@@ -21,11 +21,14 @@ import java.util.List;
public class Storage {
public static enum ImageFormat {
- QCOW2(true, true, false, "qcow2"), RAW(false, false, false, "raw"), VHD(true, true, true, "vhd"), ISO(false, false, false, "iso"), OVA(true, true, true, "ova"), VHDX(
- true,
- true,
- true,
- "vhdx"), BAREMETAL(false, false, false, "BAREMETAL"), TAR(false, false, false, "tar");
+ QCOW2(true, true, false, "qcow2"),
+ RAW(false, false, false, "raw"),
+ VHD(true, true, true, "vhd"),
+ ISO(false, false, false, "iso"),
+ OVA(true, true, true, "ova"),
+ VHDX(true, true, true, "vhdx"),
+ BAREMETAL(false, false, false, "BAREMETAL"),
+ TAR(false, false, false, "tar");
private final boolean thinProvisioned;
private final boolean supportSparse;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/storage/StoragePoolDiscoverer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/StoragePoolDiscoverer.java b/api/src/com/cloud/storage/StoragePoolDiscoverer.java
index 40a925d..88b165d 100644
--- a/api/src/com/cloud/storage/StoragePoolDiscoverer.java
+++ b/api/src/com/cloud/storage/StoragePoolDiscoverer.java
@@ -29,5 +29,6 @@ public interface StoragePoolDiscoverer extends Adapter {
Map<? extends StoragePool, Map<String, String>> find(long dcId, Long podId, URI uri, Map<String, String> details) throws DiscoveryException;
- Map<? extends StoragePool, Map<String, String>> find(long dcId, Long podId, URI uri, Map<String, String> details, String username, String password) throws DiscoveryException;
+ Map<? extends StoragePool, Map<String, String>> find(long dcId, Long podId, URI uri, Map<String, String> details, String username, String password)
+ throws DiscoveryException;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/storage/Volume.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/Volume.java b/api/src/com/cloud/storage/Volume.java
index 5344b36..bb5ee08 100755
--- a/api/src/com/cloud/storage/Volume.java
+++ b/api/src/com/cloud/storage/Volume.java
@@ -154,6 +154,7 @@ public interface Volume extends ControlledEntity, Identity, InternalIdentity, Ba
Long getPoolId();
+ @Override
State getState();
Date getAttached();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/storage/VolumeApiService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/VolumeApiService.java b/api/src/com/cloud/storage/VolumeApiService.java
index 8274b15..47afa10 100644
--- a/api/src/com/cloud/storage/VolumeApiService.java
+++ b/api/src/com/cloud/storage/VolumeApiService.java
@@ -20,8 +20,13 @@ package com.cloud.storage;
import java.net.URISyntaxException;
-import com.cloud.exception.StorageUnavailableException;
-import org.apache.cloudstack.api.command.user.volume.*;
+import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
+import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd;
+import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd;
+import org.apache.cloudstack.api.command.user.volume.ExtractVolumeCmd;
+import org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd;
+import org.apache.cloudstack.api.command.user.volume.ResizeVolumeCmd;
+import org.apache.cloudstack.api.command.user.volume.UploadVolumeCmd;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InternalErrorException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/storage/snapshot/SnapshotSchedule.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/snapshot/SnapshotSchedule.java b/api/src/com/cloud/storage/snapshot/SnapshotSchedule.java
index 6f3d2ce..db6087a 100644
--- a/api/src/com/cloud/storage/snapshot/SnapshotSchedule.java
+++ b/api/src/com/cloud/storage/snapshot/SnapshotSchedule.java
@@ -16,11 +16,11 @@
// under the License.
package com.cloud.storage.snapshot;
+import java.util.Date;
+
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
-import java.util.Date;
-
public interface SnapshotSchedule extends InternalIdentity, Identity {
Long getVolumeId();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/user/Account.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/user/Account.java b/api/src/com/cloud/user/Account.java
index 9b46eae..99ef954 100755
--- a/api/src/com/cloud/user/Account.java
+++ b/api/src/com/cloud/user/Account.java
@@ -56,6 +56,7 @@ public interface Account extends ControlledEntity, InternalIdentity, Identity {
public Long getDefaultZoneId();
+ @Override
public String getUuid();
boolean isDefault();
[11/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/Status.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/Status.java b/awsapi/src/com/amazon/s3/Status.java
index 71eca24..74b4ae4 100644
--- a/awsapi/src/com/amazon/s3/Status.java
+++ b/awsapi/src/com/amazon/s3/Status.java
@@ -125,7 +125,8 @@ public class Status implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class Status implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/StorageClass.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/StorageClass.java b/awsapi/src/com/amazon/s3/StorageClass.java
index fc4e8f1..56f7eda 100644
--- a/awsapi/src/com/amazon/s3/StorageClass.java
+++ b/awsapi/src/com/amazon/s3/StorageClass.java
@@ -120,7 +120,8 @@ public class StorageClass implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -178,9 +179,8 @@ public class StorageClass implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -320,8 +320,8 @@ public class StorageClass implements org.apache.axis2.databinding.ADBBean {
//We can safely assume an element has only one type associated with it
return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME, new java.lang.Object[] {
- org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localStorageClass)},
- null);
+ org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT,
+ org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localStorageClass)}, null);
}
@@ -333,7 +333,7 @@ public class StorageClass implements org.apache.axis2.databinding.ADBBean {
public static StorageClass fromValue(java.lang.String value) throws java.lang.IllegalArgumentException {
StorageClass enumeration = (StorageClass)
- _table_.get(value);
+ _table_.get(value);
if (enumeration == null)
throw new java.lang.IllegalArgumentException();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/TopicConfiguration.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/TopicConfiguration.java b/awsapi/src/com/amazon/s3/TopicConfiguration.java
index ba7b134..4b95149 100644
--- a/awsapi/src/com/amazon/s3/TopicConfiguration.java
+++ b/awsapi/src/com/amazon/s3/TopicConfiguration.java
@@ -153,7 +153,8 @@ public class TopicConfiguration implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -275,9 +276,8 @@ public class TopicConfiguration implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/User.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/User.java b/awsapi/src/com/amazon/s3/User.java
index 6ab4744..e13fcd1 100644
--- a/awsapi/src/com/amazon/s3/User.java
+++ b/awsapi/src/com/amazon/s3/User.java
@@ -77,7 +77,8 @@ public abstract class User extends com.amazon.s3.Grantee implements org.apache.a
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -122,9 +123,8 @@ public abstract class User extends com.amazon.s3.Grantee implements org.apache.a
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/VersionEntry.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/VersionEntry.java b/awsapi/src/com/amazon/s3/VersionEntry.java
index a46c777..900c125 100644
--- a/awsapi/src/com/amazon/s3/VersionEntry.java
+++ b/awsapi/src/com/amazon/s3/VersionEntry.java
@@ -283,7 +283,8 @@ public class VersionEntry implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -528,9 +529,8 @@ public class VersionEntry implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/VersioningConfiguration.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/VersioningConfiguration.java b/awsapi/src/com/amazon/s3/VersioningConfiguration.java
index d856411..0c40232 100644
--- a/awsapi/src/com/amazon/s3/VersioningConfiguration.java
+++ b/awsapi/src/com/amazon/s3/VersioningConfiguration.java
@@ -153,7 +153,8 @@ public class VersioningConfiguration implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -213,9 +214,8 @@ public class VersioningConfiguration implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/VersioningStatus.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/VersioningStatus.java b/awsapi/src/com/amazon/s3/VersioningStatus.java
index 22fb4aa..74b3de0 100644
--- a/awsapi/src/com/amazon/s3/VersioningStatus.java
+++ b/awsapi/src/com/amazon/s3/VersioningStatus.java
@@ -120,7 +120,8 @@ public class VersioningStatus implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -178,9 +179,8 @@ public class VersioningStatus implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -319,9 +319,9 @@ public class VersioningStatus implements org.apache.axis2.databinding.ADBBean {
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
//We can safely assume an element has only one type associated with it
- return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME,
- new java.lang.Object[] {org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT,
- org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVersioningStatus)}, null);
+ return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME, new java.lang.Object[] {
+ org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT,
+ org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVersioningStatus)}, null);
}
@@ -333,7 +333,7 @@ public class VersioningStatus implements org.apache.axis2.databinding.ADBBean {
public static VersioningStatus fromValue(java.lang.String value) throws java.lang.IllegalArgumentException {
VersioningStatus enumeration = (VersioningStatus)
- _table_.get(value);
+ _table_.get(value);
if (enumeration == null)
throw new java.lang.IllegalArgumentException();
[23/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DiskImageSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DiskImageSetType.java b/awsapi/src/com/amazon/ec2/DiskImageSetType.java
index 1adfec3..04b3aeb 100644
--- a/awsapi/src/com/amazon/ec2/DiskImageSetType.java
+++ b/awsapi/src/com/amazon/ec2/DiskImageSetType.java
@@ -142,7 +142,8 @@ public class DiskImageSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DiskImageSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,7 +463,8 @@ public class DiskImageSetType implements org.apache.axis2.databinding.ADBBean {
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.DiskImageType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.DiskImageType.class, list1));
+ object.setItem((com.amazon.ec2.DiskImageType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.DiskImageType.class,
+ list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DiskImageType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DiskImageType.java b/awsapi/src/com/amazon/ec2/DiskImageType.java
index 1c15498..5360bad 100644
--- a/awsapi/src/com/amazon/ec2/DiskImageType.java
+++ b/awsapi/src/com/amazon/ec2/DiskImageType.java
@@ -163,7 +163,8 @@ public class DiskImageType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -254,9 +255,8 @@ public class DiskImageType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DiskImageVolumeDescriptionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DiskImageVolumeDescriptionType.java b/awsapi/src/com/amazon/ec2/DiskImageVolumeDescriptionType.java
index aa66cf2..a33ffd2 100644
--- a/awsapi/src/com/amazon/ec2/DiskImageVolumeDescriptionType.java
+++ b/awsapi/src/com/amazon/ec2/DiskImageVolumeDescriptionType.java
@@ -125,7 +125,8 @@ public class DiskImageVolumeDescriptionType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class DiskImageVolumeDescriptionType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DiskImageVolumeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DiskImageVolumeType.java b/awsapi/src/com/amazon/ec2/DiskImageVolumeType.java
index eb20768..fc76e92 100644
--- a/awsapi/src/com/amazon/ec2/DiskImageVolumeType.java
+++ b/awsapi/src/com/amazon/ec2/DiskImageVolumeType.java
@@ -101,7 +101,8 @@ public class DiskImageVolumeType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DiskImageVolumeType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/EbsBlockDeviceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EbsBlockDeviceType.java b/awsapi/src/com/amazon/ec2/EbsBlockDeviceType.java
index d197d72..316260a 100644
--- a/awsapi/src/com/amazon/ec2/EbsBlockDeviceType.java
+++ b/awsapi/src/com/amazon/ec2/EbsBlockDeviceType.java
@@ -270,7 +270,8 @@ public class EbsBlockDeviceType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -474,9 +475,8 @@ public class EbsBlockDeviceType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/EbsInstanceBlockDeviceMappingResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EbsInstanceBlockDeviceMappingResponseType.java b/awsapi/src/com/amazon/ec2/EbsInstanceBlockDeviceMappingResponseType.java
index c9834f8..db9f295 100644
--- a/awsapi/src/com/amazon/ec2/EbsInstanceBlockDeviceMappingResponseType.java
+++ b/awsapi/src/com/amazon/ec2/EbsInstanceBlockDeviceMappingResponseType.java
@@ -188,7 +188,8 @@ public class EbsInstanceBlockDeviceMappingResponseType implements org.apache.axi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -362,9 +363,8 @@ public class EbsInstanceBlockDeviceMappingResponseType implements org.apache.axi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/EmptyElementType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EmptyElementType.java b/awsapi/src/com/amazon/ec2/EmptyElementType.java
index ad2f381..1b88f0a 100644
--- a/awsapi/src/com/amazon/ec2/EmptyElementType.java
+++ b/awsapi/src/com/amazon/ec2/EmptyElementType.java
@@ -77,7 +77,8 @@ public class EmptyElementType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -126,9 +127,8 @@ public class EmptyElementType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagation.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagation.java b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagation.java
index 7f0e06f..2cb888e 100644
--- a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagation.java
+++ b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagation.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class EnableVgwRoutePropagation implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVgwRoutePropagation", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME =
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVgwRoutePropagation", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class EnableVgwRoutePropagation implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class EnableVgwRoutePropagation implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationRequestType.java b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationRequestType.java
index 2779fc7..cc51cd5 100644
--- a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationRequestType.java
+++ b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationRequestType.java
@@ -125,7 +125,8 @@ public class EnableVgwRoutePropagationRequestType implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class EnableVgwRoutePropagationRequestType implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponse.java b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponse.java
index d2b8996..dbc4ed0 100644
--- a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponse.java
+++ b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class EnableVgwRoutePropagationResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVgwRoutePropagationResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "EnableVgwRoutePropagationResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class EnableVgwRoutePropagationResponse implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class EnableVgwRoutePropagationResponse implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponseType.java b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponseType.java
index 3b5d345..c9579ba 100644
--- a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponseType.java
+++ b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponseType.java
@@ -125,7 +125,8 @@ public class EnableVgwRoutePropagationResponseType implements org.apache.axis2.d
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class EnableVgwRoutePropagationResponseType implements org.apache.axis2.d
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/EnableVolumeIO.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EnableVolumeIO.java b/awsapi/src/com/amazon/ec2/EnableVolumeIO.java
index b7f1955..fc16f91 100644
--- a/awsapi/src/com/amazon/ec2/EnableVolumeIO.java
+++ b/awsapi/src/com/amazon/ec2/EnableVolumeIO.java
@@ -98,7 +98,8 @@ public class EnableVolumeIO implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class EnableVolumeIO implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class EnableVolumeIO implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVolumeIO").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVolumeIO").equals(reader.getName())) {
object.setEnableVolumeIO(com.amazon.ec2.EnableVolumeIOType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/EnableVolumeIOResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EnableVolumeIOResponse.java b/awsapi/src/com/amazon/ec2/EnableVolumeIOResponse.java
index b6f2f4c..a1f2240 100644
--- a/awsapi/src/com/amazon/ec2/EnableVolumeIOResponse.java
+++ b/awsapi/src/com/amazon/ec2/EnableVolumeIOResponse.java
@@ -98,7 +98,8 @@ public class EnableVolumeIOResponse implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class EnableVolumeIOResponse implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class EnableVolumeIOResponse implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVolumeIOResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVolumeIOResponse").equals(reader.getName())) {
object.setEnableVolumeIOResponse(com.amazon.ec2.EnableVolumeIOResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/EnableVolumeIOResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EnableVolumeIOResponseType.java b/awsapi/src/com/amazon/ec2/EnableVolumeIOResponseType.java
index a3deafd..1805c43 100644
--- a/awsapi/src/com/amazon/ec2/EnableVolumeIOResponseType.java
+++ b/awsapi/src/com/amazon/ec2/EnableVolumeIOResponseType.java
@@ -125,7 +125,8 @@ public class EnableVolumeIOResponseType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class EnableVolumeIOResponseType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/EnableVolumeIOType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/EnableVolumeIOType.java b/awsapi/src/com/amazon/ec2/EnableVolumeIOType.java
index 5a80566..8b31a51 100644
--- a/awsapi/src/com/amazon/ec2/EnableVolumeIOType.java
+++ b/awsapi/src/com/amazon/ec2/EnableVolumeIOType.java
@@ -101,7 +101,8 @@ public class EnableVolumeIOType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class EnableVolumeIOType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ExportTaskIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ExportTaskIdSetType.java b/awsapi/src/com/amazon/ec2/ExportTaskIdSetType.java
index f01d1a8..8bf5f6d 100644
--- a/awsapi/src/com/amazon/ec2/ExportTaskIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/ExportTaskIdSetType.java
@@ -142,7 +142,8 @@ public class ExportTaskIdSetType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class ExportTaskIdSetType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,7 +463,8 @@ public class ExportTaskIdSetType implements org.apache.axis2.databinding.ADBBean
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.ExportTaskIdType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.ExportTaskIdType.class, list1));
+ object.setItem((com.amazon.ec2.ExportTaskIdType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+ com.amazon.ec2.ExportTaskIdType.class, list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ExportTaskIdType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ExportTaskIdType.java b/awsapi/src/com/amazon/ec2/ExportTaskIdType.java
index d10462d..94beb23 100644
--- a/awsapi/src/com/amazon/ec2/ExportTaskIdType.java
+++ b/awsapi/src/com/amazon/ec2/ExportTaskIdType.java
@@ -101,7 +101,8 @@ public class ExportTaskIdType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class ExportTaskIdType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ExportTaskResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ExportTaskResponseType.java b/awsapi/src/com/amazon/ec2/ExportTaskResponseType.java
index 90f06dd..1fe18a9 100644
--- a/awsapi/src/com/amazon/ec2/ExportTaskResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ExportTaskResponseType.java
@@ -249,7 +249,8 @@ public class ExportTaskResponseType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -436,9 +437,8 @@ public class ExportTaskResponseType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type0.java
index 23a2ea1..361e860 100644
--- a/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type0.java
@@ -126,7 +126,8 @@ public class ExportTaskResponseTypeChoice_type0 implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -159,9 +160,8 @@ public class ExportTaskResponseTypeChoice_type0 implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type1.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type1.java b/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type1.java
index f566ed4..d9faf3f 100644
--- a/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type1.java
+++ b/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type1.java
@@ -126,7 +126,8 @@ public class ExportTaskResponseTypeChoice_type1 implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -159,9 +160,8 @@ public class ExportTaskResponseTypeChoice_type1 implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ExportTaskSetResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ExportTaskSetResponseType.java b/awsapi/src/com/amazon/ec2/ExportTaskSetResponseType.java
index 90d1a6f..5fc37d9 100644
--- a/awsapi/src/com/amazon/ec2/ExportTaskSetResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ExportTaskSetResponseType.java
@@ -142,7 +142,8 @@ public class ExportTaskSetResponseType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class ExportTaskSetResponseType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ExportToS3TaskResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ExportToS3TaskResponseType.java b/awsapi/src/com/amazon/ec2/ExportToS3TaskResponseType.java
index 66ea53b..81d57f1 100644
--- a/awsapi/src/com/amazon/ec2/ExportToS3TaskResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ExportToS3TaskResponseType.java
@@ -187,7 +187,8 @@ public class ExportToS3TaskResponseType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -364,9 +365,8 @@ public class ExportToS3TaskResponseType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ExportToS3TaskType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ExportToS3TaskType.java b/awsapi/src/com/amazon/ec2/ExportToS3TaskType.java
index 87ae4a2..3c812b8 100644
--- a/awsapi/src/com/amazon/ec2/ExportToS3TaskType.java
+++ b/awsapi/src/com/amazon/ec2/ExportToS3TaskType.java
@@ -201,7 +201,8 @@ public class ExportToS3TaskType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -379,9 +380,8 @@ public class ExportToS3TaskType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ExtensionMapper.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ExtensionMapper.java b/awsapi/src/com/amazon/ec2/ExtensionMapper.java
index 09c5f70..ec0e0d3 100644
--- a/awsapi/src/com/amazon/ec2/ExtensionMapper.java
+++ b/awsapi/src/com/amazon/ec2/ExtensionMapper.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class ExtensionMapper {
- public static java.lang.Object getTypeObject(java.lang.String namespaceURI, java.lang.String typeName, javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
+ public static java.lang.Object getTypeObject(java.lang.String namespaceURI, java.lang.String typeName, javax.xml.stream.XMLStreamReader reader)
+ throws java.lang.Exception {
if ("http://ec2.amazonaws.com/doc/2012-08-15/".equals(namespaceURI) && "CreateInternetGatewayType".equals(typeName)) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/FilterSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/FilterSetType.java b/awsapi/src/com/amazon/ec2/FilterSetType.java
index f535e5e..9e61f60 100644
--- a/awsapi/src/com/amazon/ec2/FilterSetType.java
+++ b/awsapi/src/com/amazon/ec2/FilterSetType.java
@@ -142,7 +142,8 @@ public class FilterSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class FilterSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/FilterType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/FilterType.java b/awsapi/src/com/amazon/ec2/FilterType.java
index 4c20eb5..6fa04ca 100644
--- a/awsapi/src/com/amazon/ec2/FilterType.java
+++ b/awsapi/src/com/amazon/ec2/FilterType.java
@@ -125,7 +125,8 @@ public class FilterType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class FilterType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/GetConsoleOutput.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GetConsoleOutput.java b/awsapi/src/com/amazon/ec2/GetConsoleOutput.java
index ebb53ca..ab7abab 100644
--- a/awsapi/src/com/amazon/ec2/GetConsoleOutput.java
+++ b/awsapi/src/com/amazon/ec2/GetConsoleOutput.java
@@ -98,7 +98,8 @@ public class GetConsoleOutput implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class GetConsoleOutput implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class GetConsoleOutput implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "GetConsoleOutput").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "GetConsoleOutput").equals(reader.getName())) {
object.setGetConsoleOutput(com.amazon.ec2.GetConsoleOutputType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/GetConsoleOutputResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GetConsoleOutputResponse.java b/awsapi/src/com/amazon/ec2/GetConsoleOutputResponse.java
index f3f4a0f..4b26b14 100644
--- a/awsapi/src/com/amazon/ec2/GetConsoleOutputResponse.java
+++ b/awsapi/src/com/amazon/ec2/GetConsoleOutputResponse.java
@@ -98,7 +98,8 @@ public class GetConsoleOutputResponse implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class GetConsoleOutputResponse implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/GetConsoleOutputResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GetConsoleOutputResponseType.java b/awsapi/src/com/amazon/ec2/GetConsoleOutputResponseType.java
index 4bb8d31..86ec6be 100644
--- a/awsapi/src/com/amazon/ec2/GetConsoleOutputResponseType.java
+++ b/awsapi/src/com/amazon/ec2/GetConsoleOutputResponseType.java
@@ -173,7 +173,8 @@ public class GetConsoleOutputResponseType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -350,9 +351,8 @@ public class GetConsoleOutputResponseType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/GetConsoleOutputType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GetConsoleOutputType.java b/awsapi/src/com/amazon/ec2/GetConsoleOutputType.java
index dfebfa7..5bddcbe 100644
--- a/awsapi/src/com/amazon/ec2/GetConsoleOutputType.java
+++ b/awsapi/src/com/amazon/ec2/GetConsoleOutputType.java
@@ -101,7 +101,8 @@ public class GetConsoleOutputType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class GetConsoleOutputType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/GetPasswordData.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GetPasswordData.java b/awsapi/src/com/amazon/ec2/GetPasswordData.java
index cb003e9..2b6cde3 100644
--- a/awsapi/src/com/amazon/ec2/GetPasswordData.java
+++ b/awsapi/src/com/amazon/ec2/GetPasswordData.java
@@ -98,7 +98,8 @@ public class GetPasswordData implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class GetPasswordData implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class GetPasswordData implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "GetPasswordData").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "GetPasswordData").equals(reader.getName())) {
object.setGetPasswordData(com.amazon.ec2.GetPasswordDataType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/GetPasswordDataResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GetPasswordDataResponse.java b/awsapi/src/com/amazon/ec2/GetPasswordDataResponse.java
index c53a87d..5784fc9 100644
--- a/awsapi/src/com/amazon/ec2/GetPasswordDataResponse.java
+++ b/awsapi/src/com/amazon/ec2/GetPasswordDataResponse.java
@@ -98,7 +98,8 @@ public class GetPasswordDataResponse implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class GetPasswordDataResponse implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/GetPasswordDataResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GetPasswordDataResponseType.java b/awsapi/src/com/amazon/ec2/GetPasswordDataResponseType.java
index 185a47d..234d1df 100644
--- a/awsapi/src/com/amazon/ec2/GetPasswordDataResponseType.java
+++ b/awsapi/src/com/amazon/ec2/GetPasswordDataResponseType.java
@@ -173,7 +173,8 @@ public class GetPasswordDataResponseType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -350,9 +351,8 @@ public class GetPasswordDataResponseType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/GetPasswordDataType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GetPasswordDataType.java b/awsapi/src/com/amazon/ec2/GetPasswordDataType.java
index 9429c3d..850192b 100644
--- a/awsapi/src/com/amazon/ec2/GetPasswordDataType.java
+++ b/awsapi/src/com/amazon/ec2/GetPasswordDataType.java
@@ -101,7 +101,8 @@ public class GetPasswordDataType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class GetPasswordDataType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/GroupItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GroupItemType.java b/awsapi/src/com/amazon/ec2/GroupItemType.java
index b677b2b..0930702 100644
--- a/awsapi/src/com/amazon/ec2/GroupItemType.java
+++ b/awsapi/src/com/amazon/ec2/GroupItemType.java
@@ -153,7 +153,8 @@ public class GroupItemType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -267,9 +268,8 @@ public class GroupItemType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/GroupSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/GroupSetType.java b/awsapi/src/com/amazon/ec2/GroupSetType.java
index 5423625..cf4ccaa 100644
--- a/awsapi/src/com/amazon/ec2/GroupSetType.java
+++ b/awsapi/src/com/amazon/ec2/GroupSetType.java
@@ -142,7 +142,8 @@ public class GroupSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class GroupSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,7 +463,8 @@ public class GroupSetType implements org.apache.axis2.databinding.ADBBean {
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.GroupItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.GroupItemType.class, list1));
+ object.setItem((com.amazon.ec2.GroupItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.GroupItemType.class,
+ list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/IamInstanceProfileRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/IamInstanceProfileRequestType.java b/awsapi/src/com/amazon/ec2/IamInstanceProfileRequestType.java
index 1de95db..4655a17 100644
--- a/awsapi/src/com/amazon/ec2/IamInstanceProfileRequestType.java
+++ b/awsapi/src/com/amazon/ec2/IamInstanceProfileRequestType.java
@@ -153,7 +153,8 @@ public class IamInstanceProfileRequestType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -267,9 +268,8 @@ public class IamInstanceProfileRequestType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/IamInstanceProfileResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/IamInstanceProfileResponseType.java b/awsapi/src/com/amazon/ec2/IamInstanceProfileResponseType.java
index 4d0ce05..9df93c5 100644
--- a/awsapi/src/com/amazon/ec2/IamInstanceProfileResponseType.java
+++ b/awsapi/src/com/amazon/ec2/IamInstanceProfileResponseType.java
@@ -125,7 +125,8 @@ public class IamInstanceProfileResponseType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class IamInstanceProfileResponseType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java b/awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java
index 776c32d..818d49b 100644
--- a/awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java
+++ b/awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java
@@ -125,7 +125,8 @@ public class IcmpTypeCodeType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -232,9 +233,8 @@ public class IcmpTypeCodeType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ImportInstance.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstance.java b/awsapi/src/com/amazon/ec2/ImportInstance.java
index 47a0d8b..45913bd 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstance.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstance.java
@@ -98,7 +98,8 @@ public class ImportInstance implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ImportInstance implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class ImportInstance implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportInstance").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportInstance").equals(reader.getName())) {
object.setImportInstance(com.amazon.ec2.ImportInstanceType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ImportInstanceGroupItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceGroupItemType.java b/awsapi/src/com/amazon/ec2/ImportInstanceGroupItemType.java
index e99e53a..5717236 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstanceGroupItemType.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstanceGroupItemType.java
@@ -153,7 +153,8 @@ public class ImportInstanceGroupItemType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -267,9 +268,8 @@ public class ImportInstanceGroupItemType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ImportInstanceGroupSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceGroupSetType.java b/awsapi/src/com/amazon/ec2/ImportInstanceGroupSetType.java
index 0b9367b..c85a949 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstanceGroupSetType.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstanceGroupSetType.java
@@ -142,7 +142,8 @@ public class ImportInstanceGroupSetType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class ImportInstanceGroupSetType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ImportInstanceLaunchSpecificationType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceLaunchSpecificationType.java b/awsapi/src/com/amazon/ec2/ImportInstanceLaunchSpecificationType.java
index 9851c3a..c9621c8 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstanceLaunchSpecificationType.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstanceLaunchSpecificationType.java
@@ -391,7 +391,8 @@ public class ImportInstanceLaunchSpecificationType implements org.apache.axis2.d
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -625,9 +626,8 @@ public class ImportInstanceLaunchSpecificationType implements org.apache.axis2.d
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
[29/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeConversionTasksType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeConversionTasksType.java b/awsapi/src/com/amazon/ec2/DescribeConversionTasksType.java
index a510608..66670bf 100644
--- a/awsapi/src/com/amazon/ec2/DescribeConversionTasksType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeConversionTasksType.java
@@ -101,7 +101,8 @@ public class DescribeConversionTasksType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -155,9 +156,8 @@ public class DescribeConversionTasksType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeCustomerGateways.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeCustomerGateways.java b/awsapi/src/com/amazon/ec2/DescribeCustomerGateways.java
index 298d97c..dca00a0 100644
--- a/awsapi/src/com/amazon/ec2/DescribeCustomerGateways.java
+++ b/awsapi/src/com/amazon/ec2/DescribeCustomerGateways.java
@@ -98,7 +98,8 @@ public class DescribeCustomerGateways implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeCustomerGateways implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponse.java b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponse.java
index 9a925ad..f4a99e8 100644
--- a/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeCustomerGatewaysResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeCustomerGatewaysResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "DescribeCustomerGatewaysResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeCustomerGatewaysResponse implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeCustomerGatewaysResponse implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponseType.java b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponseType.java
index 8521182..d326f4e 100644
--- a/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponseType.java
@@ -125,7 +125,8 @@ public class DescribeCustomerGatewaysResponseType implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeCustomerGatewaysResponseType implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysType.java b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysType.java
index 4caa222..7cad597 100644
--- a/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysType.java
@@ -153,7 +153,8 @@ public class DescribeCustomerGatewaysType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -213,9 +214,8 @@ public class DescribeCustomerGatewaysType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeDhcpOptions.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeDhcpOptions.java b/awsapi/src/com/amazon/ec2/DescribeDhcpOptions.java
index ed030e6..e24efe4 100644
--- a/awsapi/src/com/amazon/ec2/DescribeDhcpOptions.java
+++ b/awsapi/src/com/amazon/ec2/DescribeDhcpOptions.java
@@ -98,7 +98,8 @@ public class DescribeDhcpOptions implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeDhcpOptions implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeDhcpOptions implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeDhcpOptions").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeDhcpOptions").equals(reader.getName())) {
object.setDescribeDhcpOptions(com.amazon.ec2.DescribeDhcpOptionsType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponse.java b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponse.java
index 60341b2..67b17b2 100644
--- a/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeDhcpOptionsResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeDhcpOptionsResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeDhcpOptionsResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeDhcpOptionsResponse implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeDhcpOptionsResponse implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponseType.java
index d6e4d06..a4e3086 100644
--- a/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponseType.java
@@ -125,7 +125,8 @@ public class DescribeDhcpOptionsResponseType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeDhcpOptionsResponseType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsType.java b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsType.java
index 8dfa315..7207c11 100644
--- a/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsType.java
@@ -153,7 +153,8 @@ public class DescribeDhcpOptionsType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -213,9 +214,8 @@ public class DescribeDhcpOptionsType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeExportTasks.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeExportTasks.java b/awsapi/src/com/amazon/ec2/DescribeExportTasks.java
index e84cd2c..5aeeeb0 100644
--- a/awsapi/src/com/amazon/ec2/DescribeExportTasks.java
+++ b/awsapi/src/com/amazon/ec2/DescribeExportTasks.java
@@ -98,7 +98,8 @@ public class DescribeExportTasks implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeExportTasks implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeExportTasks implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeExportTasks").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeExportTasks").equals(reader.getName())) {
object.setDescribeExportTasks(com.amazon.ec2.DescribeExportTasksType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeExportTasksResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeExportTasksResponse.java b/awsapi/src/com/amazon/ec2/DescribeExportTasksResponse.java
index f2b9888..bc75d93 100644
--- a/awsapi/src/com/amazon/ec2/DescribeExportTasksResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeExportTasksResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeExportTasksResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeExportTasksResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeExportTasksResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeExportTasksResponse implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeExportTasksResponse implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeExportTasksResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeExportTasksResponseType.java b/awsapi/src/com/amazon/ec2/DescribeExportTasksResponseType.java
index c993dfd..d8a001b 100644
--- a/awsapi/src/com/amazon/ec2/DescribeExportTasksResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeExportTasksResponseType.java
@@ -125,7 +125,8 @@ public class DescribeExportTasksResponseType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeExportTasksResponseType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeExportTasksType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeExportTasksType.java b/awsapi/src/com/amazon/ec2/DescribeExportTasksType.java
index 674f1a0..bd17866 100644
--- a/awsapi/src/com/amazon/ec2/DescribeExportTasksType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeExportTasksType.java
@@ -101,7 +101,8 @@ public class DescribeExportTasksType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -155,9 +156,8 @@ public class DescribeExportTasksType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeImageAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImageAttribute.java b/awsapi/src/com/amazon/ec2/DescribeImageAttribute.java
index b9d6669..25ba4cb 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImageAttribute.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImageAttribute.java
@@ -98,7 +98,8 @@ public class DescribeImageAttribute implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeImageAttribute implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeImageAttribute implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImageAttribute").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImageAttribute").equals(reader.getName())) {
object.setDescribeImageAttribute(com.amazon.ec2.DescribeImageAttributeType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponse.java b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponse.java
index dcaa4b3..1e88e88 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeImageAttributeResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImageAttributeResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImageAttributeResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeImageAttributeResponse implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeImageAttributeResponse implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseType.java b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseType.java
index 0eb0854..13ebbb9 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseType.java
@@ -149,7 +149,8 @@ public class DescribeImageAttributeResponseType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -267,9 +268,8 @@ public class DescribeImageAttributeResponseType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseTypeChoice_type0.java
index 63c8cc6..f3d9d51 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseTypeChoice_type0.java
@@ -336,7 +336,8 @@ public class DescribeImageAttributeResponseTypeChoice_type0 implements org.apach
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -399,9 +400,8 @@ public class DescribeImageAttributeResponseTypeChoice_type0 implements org.apach
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeImageAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImageAttributeType.java b/awsapi/src/com/amazon/ec2/DescribeImageAttributeType.java
index 1a37804..4675bd8 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImageAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImageAttributeType.java
@@ -125,7 +125,8 @@ public class DescribeImageAttributeType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeImageAttributeType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeImageAttributesGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImageAttributesGroup.java b/awsapi/src/com/amazon/ec2/DescribeImageAttributesGroup.java
index 4e0f870..aec8ba3 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImageAttributesGroup.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImageAttributesGroup.java
@@ -378,7 +378,8 @@ public class DescribeImageAttributesGroup implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -447,9 +448,8 @@ public class DescribeImageAttributesGroup implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeImages.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImages.java b/awsapi/src/com/amazon/ec2/DescribeImages.java
index 1c98608..1915a37 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImages.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImages.java
@@ -98,7 +98,8 @@ public class DescribeImages implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeImages implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeImages implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImages").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImages").equals(reader.getName())) {
object.setDescribeImages(com.amazon.ec2.DescribeImagesType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeImagesExecutableBySetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesExecutableBySetType.java b/awsapi/src/com/amazon/ec2/DescribeImagesExecutableBySetType.java
index 3a2a6a7..e1b28d3 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesExecutableBySetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesExecutableBySetType.java
@@ -142,7 +142,8 @@ public class DescribeImagesExecutableBySetType implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeImagesExecutableBySetType implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeImagesExecutableByType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesExecutableByType.java b/awsapi/src/com/amazon/ec2/DescribeImagesExecutableByType.java
index c6fc751..1c4cd33 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesExecutableByType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesExecutableByType.java
@@ -101,7 +101,8 @@ public class DescribeImagesExecutableByType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DescribeImagesExecutableByType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeImagesInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesInfoType.java b/awsapi/src/com/amazon/ec2/DescribeImagesInfoType.java
index 4511bb3..2e9fd84 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesInfoType.java
@@ -142,7 +142,8 @@ public class DescribeImagesInfoType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeImagesInfoType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeImagesItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesItemType.java b/awsapi/src/com/amazon/ec2/DescribeImagesItemType.java
index 81e58a3..6a852a8 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesItemType.java
@@ -101,7 +101,8 @@ public class DescribeImagesItemType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DescribeImagesItemType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeImagesOwnerType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesOwnerType.java b/awsapi/src/com/amazon/ec2/DescribeImagesOwnerType.java
index cef2122..4602020 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesOwnerType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesOwnerType.java
@@ -101,7 +101,8 @@ public class DescribeImagesOwnerType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DescribeImagesOwnerType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeImagesOwnersType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesOwnersType.java b/awsapi/src/com/amazon/ec2/DescribeImagesOwnersType.java
index 01f9bda..d8dcff4 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesOwnersType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesOwnersType.java
@@ -142,7 +142,8 @@ public class DescribeImagesOwnersType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeImagesOwnersType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeImagesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesResponse.java b/awsapi/src/com/amazon/ec2/DescribeImagesResponse.java
index e21339b..fbd5367 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesResponse.java
@@ -98,7 +98,8 @@ public class DescribeImagesResponse implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeImagesResponse implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeImagesResponse implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImagesResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImagesResponse").equals(reader.getName())) {
object.setDescribeImagesResponse(com.amazon.ec2.DescribeImagesResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeImagesResponseInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesResponseInfoType.java b/awsapi/src/com/amazon/ec2/DescribeImagesResponseInfoType.java
index 336044d..f3c4c99 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesResponseInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesResponseInfoType.java
@@ -142,7 +142,8 @@ public class DescribeImagesResponseInfoType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeImagesResponseInfoType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeImagesResponseItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesResponseItemType.java b/awsapi/src/com/amazon/ec2/DescribeImagesResponseItemType.java
index 7b22361..38c9212 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesResponseItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesResponseItemType.java
@@ -819,7 +819,8 @@ public class DescribeImagesResponseItemType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -1444,9 +1445,8 @@ public class DescribeImagesResponseItemType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeImagesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeImagesResponseType.java
index b994348..9997b82 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesResponseType.java
@@ -125,7 +125,8 @@ public class DescribeImagesResponseType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeImagesResponseType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeImagesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesType.java b/awsapi/src/com/amazon/ec2/DescribeImagesType.java
index 216cb64..8772bb9 100644
--- a/awsapi/src/com/amazon/ec2/DescribeImagesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeImagesType.java
@@ -215,7 +215,8 @@ public class DescribeImagesType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -285,9 +286,8 @@ public class DescribeImagesType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInstanceAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceAttribute.java b/awsapi/src/com/amazon/ec2/DescribeInstanceAttribute.java
index 0fbc7be..3023f0a 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceAttribute.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceAttribute.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeInstanceAttribute implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceAttribute", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME =
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceAttribute", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeInstanceAttribute implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeInstanceAttribute implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponse.java b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponse.java
index 2938a9f..997baaa 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeInstanceAttributeResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceAttributeResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "DescribeInstanceAttributeResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeInstanceAttributeResponse implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeInstanceAttributeResponse implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseType.java b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseType.java
index 553d730..7982b07 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseType.java
@@ -149,7 +149,8 @@ public class DescribeInstanceAttributeResponseType implements org.apache.axis2.d
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -267,9 +268,8 @@ public class DescribeInstanceAttributeResponseType implements org.apache.axis2.d
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseTypeChoice_type0.java
index 48db43a..e8c3a1b 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseTypeChoice_type0.java
@@ -588,7 +588,8 @@ public class DescribeInstanceAttributeResponseTypeChoice_type0 implements org.ap
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -603,7 +604,8 @@ public class DescribeInstanceAttributeResponseTypeChoice_type0 implements org.ap
java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/");
if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) {
- writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeInstanceAttributeResponseTypeChoice_type0", xmlWriter);
+ writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeInstanceAttributeResponseTypeChoice_type0",
+ xmlWriter);
} else {
writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeInstanceAttributeResponseTypeChoice_type0", xmlWriter);
}
@@ -643,8 +645,8 @@ public class DescribeInstanceAttributeResponseTypeChoice_type0 implements org.ap
if (localInstanceInitiatedShutdownBehavior == null) {
throw new org.apache.axis2.databinding.ADBException("instanceInitiatedShutdownBehavior cannot be null!!");
}
- localInstanceInitiatedShutdownBehavior.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "instanceInitiatedShutdownBehavior"),
- factory, xmlWriter);
+ localInstanceInitiatedShutdownBehavior.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "instanceInitiatedShutdownBehavior"), factory, xmlWriter);
}
if (localRootDeviceNameTracker) {
if (localRootDeviceName == null) {
@@ -688,9 +690,8 @@ public class DescribeInstanceAttributeResponseTypeChoice_type0 implements org.ap
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -1000,7 +1001,8 @@ public class DescribeInstanceAttributeResponseTypeChoice_type0 implements org.ap
else
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) {
object.setDisableApiTermination(com.amazon.ec2.NullableAttributeBooleanValueType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeType.java b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeType.java
index 216de4c..c1a1327 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeType.java
@@ -125,7 +125,8 @@ public class DescribeInstanceAttributeType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeInstanceAttributeType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributesGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributesGroup.java b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributesGroup.java
index c6ec82a..c7d2028 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributesGroup.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributesGroup.java
@@ -588,7 +588,8 @@ public class DescribeInstanceAttributesGroup implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -643,8 +644,8 @@ public class DescribeInstanceAttributesGroup implements org.apache.axis2.databin
if (localInstanceInitiatedShutdownBehavior == null) {
throw new org.apache.axis2.databinding.ADBException("instanceInitiatedShutdownBehavior cannot be null!!");
}
- localInstanceInitiatedShutdownBehavior.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "instanceInitiatedShutdownBehavior"),
- factory, xmlWriter);
+ localInstanceInitiatedShutdownBehavior.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "instanceInitiatedShutdownBehavior"), factory, xmlWriter);
}
if (localRootDeviceNameTracker) {
if (localRootDeviceName == null) {
@@ -688,9 +689,8 @@ public class DescribeInstanceAttributesGroup implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -1000,7 +1000,8 @@ public class DescribeInstanceAttributesGroup implements org.apache.axis2.databin
else
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) {
object.setDisableApiTermination(com.amazon.ec2.EmptyElementType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInstanceStatus.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceStatus.java b/awsapi/src/com/amazon/ec2/DescribeInstanceStatus.java
index 1c5089c..0f97e94 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceStatus.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceStatus.java
@@ -98,7 +98,8 @@ public class DescribeInstanceStatus implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeInstanceStatus implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeInstanceStatus implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceStatus").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceStatus").equals(reader.getName())) {
object.setDescribeInstanceStatus(com.amazon.ec2.DescribeInstanceStatusType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponse.java b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponse.java
index 3391374..68a1722 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeInstanceStatusResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceStatusResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceStatusResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeInstanceStatusResponse implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeInstanceStatusResponse implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
[28/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponseType.java b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponseType.java
index 3c5365a..62d9ad1 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponseType.java
@@ -163,7 +163,8 @@ public class DescribeInstanceStatusResponseType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -281,9 +282,8 @@ public class DescribeInstanceStatusResponseType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceStatusType.java b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusType.java
index d96c049..c963044 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstanceStatusType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusType.java
@@ -255,7 +255,8 @@ public class DescribeInstanceStatusType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -407,9 +408,8 @@ public class DescribeInstanceStatusType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInstances.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstances.java b/awsapi/src/com/amazon/ec2/DescribeInstances.java
index 6f40a56..b583595 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstances.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstances.java
@@ -98,7 +98,8 @@ public class DescribeInstances implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeInstances implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeInstances implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstances").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstances").equals(reader.getName())) {
object.setDescribeInstances(com.amazon.ec2.DescribeInstancesType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInstancesInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstancesInfoType.java b/awsapi/src/com/amazon/ec2/DescribeInstancesInfoType.java
index 49f8c60..9778634 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstancesInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstancesInfoType.java
@@ -142,7 +142,8 @@ public class DescribeInstancesInfoType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeInstancesInfoType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInstancesItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstancesItemType.java b/awsapi/src/com/amazon/ec2/DescribeInstancesItemType.java
index 296671a..f23c4a4 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstancesItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstancesItemType.java
@@ -101,7 +101,8 @@ public class DescribeInstancesItemType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DescribeInstancesItemType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstancesResponse.java b/awsapi/src/com/amazon/ec2/DescribeInstancesResponse.java
index fe52c05..c407de6 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstancesResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeInstancesResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstancesResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME =
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstancesResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeInstancesResponse implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeInstancesResponse implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInstancesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstancesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeInstancesResponseType.java
index e34ea42..8b263ed 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstancesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstancesResponseType.java
@@ -125,7 +125,8 @@ public class DescribeInstancesResponseType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeInstancesResponseType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInstancesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInstancesType.java b/awsapi/src/com/amazon/ec2/DescribeInstancesType.java
index dbfbed1..8ee4c0b 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInstancesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInstancesType.java
@@ -139,7 +139,8 @@ public class DescribeInstancesType implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -198,9 +199,8 @@ public class DescribeInstancesType implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInternetGateways.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInternetGateways.java b/awsapi/src/com/amazon/ec2/DescribeInternetGateways.java
index 9734bac..65a620e 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInternetGateways.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInternetGateways.java
@@ -98,7 +98,8 @@ public class DescribeInternetGateways implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeInternetGateways implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponse.java b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponse.java
index 3ac11ce..6f45f43 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeInternetGatewaysResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInternetGatewaysResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "DescribeInternetGatewaysResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeInternetGatewaysResponse implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeInternetGatewaysResponse implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponseType.java b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponseType.java
index 0fb8b3a..61bbc62 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponseType.java
@@ -125,7 +125,8 @@ public class DescribeInternetGatewaysResponseType implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeInternetGatewaysResponseType implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysType.java b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysType.java
index 586d198..7531646 100644
--- a/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysType.java
@@ -139,7 +139,8 @@ public class DescribeInternetGatewaysType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -198,9 +199,8 @@ public class DescribeInternetGatewaysType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeKeyPairs.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairs.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairs.java
index 387ab51..b321011 100644
--- a/awsapi/src/com/amazon/ec2/DescribeKeyPairs.java
+++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairs.java
@@ -98,7 +98,8 @@ public class DescribeKeyPairs implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeKeyPairs implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeKeyPairs implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeKeyPairs").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeKeyPairs").equals(reader.getName())) {
object.setDescribeKeyPairs(com.amazon.ec2.DescribeKeyPairsType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeKeyPairsInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsInfoType.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsInfoType.java
index c1c96f5..956f37f 100644
--- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsInfoType.java
@@ -142,7 +142,8 @@ public class DescribeKeyPairsInfoType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeKeyPairsInfoType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeKeyPairsItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsItemType.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsItemType.java
index 9c784b8..843479d 100644
--- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsItemType.java
@@ -101,7 +101,8 @@ public class DescribeKeyPairsItemType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DescribeKeyPairsItemType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponse.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponse.java
index 78c9a41..984730a 100644
--- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponse.java
@@ -98,7 +98,8 @@ public class DescribeKeyPairsResponse implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeKeyPairsResponse implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseInfoType.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseInfoType.java
index 9b184f6..b0c8a84 100644
--- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseInfoType.java
@@ -142,7 +142,8 @@ public class DescribeKeyPairsResponseInfoType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeKeyPairsResponseInfoType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseItemType.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseItemType.java
index 487c116..67ae4c3 100644
--- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseItemType.java
@@ -125,7 +125,8 @@ public class DescribeKeyPairsResponseItemType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class DescribeKeyPairsResponseItemType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseType.java
index 7afe6a1..ce55fe9 100644
--- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseType.java
@@ -125,7 +125,8 @@ public class DescribeKeyPairsResponseType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeKeyPairsResponseType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeKeyPairsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsType.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsType.java
index 4177c9e..f5325ba 100644
--- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsType.java
@@ -139,7 +139,8 @@ public class DescribeKeyPairsType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -198,9 +199,8 @@ public class DescribeKeyPairsType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeLicenses.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeLicenses.java b/awsapi/src/com/amazon/ec2/DescribeLicenses.java
index 9d2c57b..ade169b 100644
--- a/awsapi/src/com/amazon/ec2/DescribeLicenses.java
+++ b/awsapi/src/com/amazon/ec2/DescribeLicenses.java
@@ -98,7 +98,8 @@ public class DescribeLicenses implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeLicenses implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeLicenses implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeLicenses").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeLicenses").equals(reader.getName())) {
object.setDescribeLicenses(com.amazon.ec2.DescribeLicensesType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeLicensesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeLicensesResponse.java b/awsapi/src/com/amazon/ec2/DescribeLicensesResponse.java
index 0c9b394..de8d58b 100644
--- a/awsapi/src/com/amazon/ec2/DescribeLicensesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeLicensesResponse.java
@@ -98,7 +98,8 @@ public class DescribeLicensesResponse implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeLicensesResponse implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeLicensesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeLicensesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeLicensesResponseType.java
index 2f86166..0bc5716 100644
--- a/awsapi/src/com/amazon/ec2/DescribeLicensesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeLicensesResponseType.java
@@ -125,7 +125,8 @@ public class DescribeLicensesResponseType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeLicensesResponseType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeLicensesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeLicensesType.java b/awsapi/src/com/amazon/ec2/DescribeLicensesType.java
index d7db127..332b172 100644
--- a/awsapi/src/com/amazon/ec2/DescribeLicensesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeLicensesType.java
@@ -153,7 +153,8 @@ public class DescribeLicensesType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -213,9 +214,8 @@ public class DescribeLicensesType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeNetworkAcls.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkAcls.java b/awsapi/src/com/amazon/ec2/DescribeNetworkAcls.java
index fb1062f..4b91d75 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkAcls.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkAcls.java
@@ -98,7 +98,8 @@ public class DescribeNetworkAcls implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeNetworkAcls implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeNetworkAcls implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkAcls").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkAcls").equals(reader.getName())) {
object.setDescribeNetworkAcls(com.amazon.ec2.DescribeNetworkAclsType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponse.java b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponse.java
index 83cf586..b2139fe 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeNetworkAclsResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkAclsResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkAclsResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeNetworkAclsResponse implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeNetworkAclsResponse implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponseType.java
index 8287435..2a106ba 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponseType.java
@@ -125,7 +125,8 @@ public class DescribeNetworkAclsResponseType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeNetworkAclsResponseType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkAclsType.java b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsType.java
index 2eb50fb..325f2ab 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkAclsType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsType.java
@@ -139,7 +139,8 @@ public class DescribeNetworkAclsType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -198,9 +199,8 @@ public class DescribeNetworkAclsType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttribute.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttribute.java
index a02b8af..c6d4e22 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttribute.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttribute.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeNetworkInterfaceAttribute implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkInterfaceAttribute", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "DescribeNetworkInterfaceAttribute", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeNetworkInterfaceAttribute implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeNetworkInterfaceAttribute implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponse.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponse.java
index ed3acd9..9537b30 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponse.java
@@ -30,8 +30,8 @@ package com.amazon.ec2;
public class DescribeNetworkInterfaceAttributeResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkInterfaceAttributeResponse",
- "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "DescribeNetworkInterfaceAttributeResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -99,7 +99,8 @@ public class DescribeNetworkInterfaceAttributeResponse implements org.apache.axi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -119,9 +120,8 @@ public class DescribeNetworkInterfaceAttributeResponse implements org.apache.axi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseType.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseType.java
index 486da72..c088573 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseType.java
@@ -149,7 +149,8 @@ public class DescribeNetworkInterfaceAttributeResponseType implements org.apache
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -267,9 +268,8 @@ public class DescribeNetworkInterfaceAttributeResponseType implements org.apache
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseTypeChoice_type0.java
index 4052b7a..9cdcd3e 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseTypeChoice_type0.java
@@ -252,7 +252,8 @@ public class DescribeNetworkInterfaceAttributeResponseTypeChoice_type0 implement
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -267,8 +268,8 @@ public class DescribeNetworkInterfaceAttributeResponseTypeChoice_type0 implement
java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/");
if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) {
- writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeNetworkInterfaceAttributeResponseTypeChoice_type0",
- xmlWriter);
+ writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type",
+ namespacePrefix + ":DescribeNetworkInterfaceAttributeResponseTypeChoice_type0", xmlWriter);
} else {
writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeNetworkInterfaceAttributeResponseTypeChoice_type0", xmlWriter);
}
@@ -304,9 +305,8 @@ public class DescribeNetworkInterfaceAttributeResponseTypeChoice_type0 implement
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeType.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeType.java
index 90422e5..b0be0fd 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeType.java
@@ -125,7 +125,8 @@ public class DescribeNetworkInterfaceAttributeType implements org.apache.axis2.d
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeNetworkInterfaceAttributeType implements org.apache.axis2.d
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributesGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributesGroup.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributesGroup.java
index 1f0cf6b..80a3db9 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributesGroup.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributesGroup.java
@@ -252,7 +252,8 @@ public class DescribeNetworkInterfaceAttributesGroup implements org.apache.axis2
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -303,9 +304,8 @@ public class DescribeNetworkInterfaceAttributesGroup implements org.apache.axis2
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaces.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaces.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaces.java
index 59e4aa7..0eb83fd 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaces.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaces.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeNetworkInterfaces implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkInterfaces", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME =
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkInterfaces", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeNetworkInterfaces implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeNetworkInterfaces implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponse.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponse.java
index 866cd54..0f2e83b 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeNetworkInterfacesResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkInterfacesResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "DescribeNetworkInterfacesResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeNetworkInterfacesResponse implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeNetworkInterfacesResponse implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponseType.java
index 36865e3..22415d4 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponseType.java
@@ -125,7 +125,8 @@ public class DescribeNetworkInterfacesResponseType implements org.apache.axis2.d
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeNetworkInterfacesResponseType implements org.apache.axis2.d
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesType.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesType.java
index 0b5e494..cc85c5e 100644
--- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesType.java
@@ -153,7 +153,8 @@ public class DescribeNetworkInterfacesType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -213,9 +214,8 @@ public class DescribeNetworkInterfacesType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -431,7 +431,8 @@ public class DescribeNetworkInterfacesType implements org.apache.axis2.databindi
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceIdSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceIdSet").equals(reader.getName())) {
object.setNetworkInterfaceIdSet(com.amazon.ec2.NetworkInterfaceIdSetType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribePlacementGroupItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribePlacementGroupItemType.java b/awsapi/src/com/amazon/ec2/DescribePlacementGroupItemType.java
index 9c597ba..4e091e3 100644
--- a/awsapi/src/com/amazon/ec2/DescribePlacementGroupItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribePlacementGroupItemType.java
@@ -101,7 +101,8 @@ public class DescribePlacementGroupItemType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DescribePlacementGroupItemType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribePlacementGroups.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribePlacementGroups.java b/awsapi/src/com/amazon/ec2/DescribePlacementGroups.java
index 7f6fbf0..27a18d6 100644
--- a/awsapi/src/com/amazon/ec2/DescribePlacementGroups.java
+++ b/awsapi/src/com/amazon/ec2/DescribePlacementGroups.java
@@ -98,7 +98,8 @@ public class DescribePlacementGroups implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribePlacementGroups implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
[43/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java
index 4401a5d..2e96965 100644
--- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java
@@ -17,19 +17,25 @@
package org.apache.cloudstack.api.command.user.region.ha.gslb;
-import com.cloud.event.EventTypes;
-import com.cloud.region.ha.GlobalLoadBalancerRule;
-import com.cloud.region.ha.GlobalLoadBalancingRulesService;
-import com.cloud.user.Account;
+import javax.inject.Inject;
+
+import org.apache.log4j.Logger;
-import org.apache.cloudstack.api.*;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandJobType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.GlobalLoadBalancerResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
-import javax.inject.Inject;
+import com.cloud.event.EventTypes;
+import com.cloud.region.ha.GlobalLoadBalancerRule;
+import com.cloud.region.ha.GlobalLoadBalancingRulesService;
+import com.cloud.user.Account;
@APICommand(name = "deleteGlobalLoadBalancerRule", description = "Deletes a global load balancer rule.", responseObject = SuccessResponse.class)
public class DeleteGlobalLoadBalancerRuleCmd extends BaseAsyncCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java
index ab62a41..f37aba2 100644
--- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java
@@ -17,8 +17,13 @@
package org.apache.cloudstack.api.command.user.region.ha.gslb;
-import com.cloud.region.ha.GlobalLoadBalancerRule;
-import com.cloud.region.ha.GlobalLoadBalancingRulesService;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
@@ -26,11 +31,9 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.GlobalLoadBalancerResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.RegionResponse;
-import org.apache.log4j.Logger;
-import javax.inject.Inject;
-import java.util.ArrayList;
-import java.util.List;
+import com.cloud.region.ha.GlobalLoadBalancerRule;
+import com.cloud.region.ha.GlobalLoadBalancingRulesService;
@APICommand(name = "listGlobalLoadBalancerRules", description = "Lists load balancer rules.", responseObject = GlobalLoadBalancerResponse.class)
public class ListGlobalLoadBalancerRuleCmd extends BaseListTaggedResourcesCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java
index 2374a5d..b30f4d8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java
@@ -17,24 +17,29 @@
package org.apache.cloudstack.api.command.user.region.ha.gslb;
-import com.cloud.event.EventTypes;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.region.ha.GlobalLoadBalancerRule;
-import com.cloud.region.ha.GlobalLoadBalancingRulesService;
-import com.cloud.user.Account;
-import com.cloud.utils.StringUtils;
+import java.util.List;
+
+import javax.inject.Inject;
-import org.apache.cloudstack.api.*;
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.GlobalLoadBalancerResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
-import javax.inject.Inject;
-
-import java.util.List;
+import com.cloud.event.EventTypes;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.region.ha.GlobalLoadBalancerRule;
+import com.cloud.region.ha.GlobalLoadBalancingRulesService;
+import com.cloud.user.Account;
+import com.cloud.utils.StringUtils;
@APICommand(name = "removeFromGlobalLoadBalancerRule",
description = "Removes a load balancer rule association with" + " global load balancer rule",
@@ -48,7 +53,11 @@ public class RemoveFromGlobalLoadBalancerRuleCmd extends BaseAsyncCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = GlobalLoadBalancerResponse.class, required = true, description = "The ID of the load balancer rule")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = GlobalLoadBalancerResponse.class,
+ required = true,
+ description = "The ID of the load balancer rule")
private Long id;
@Parameter(name = ApiConstants.LOAD_BALANCER_RULE_LIST,
@@ -104,7 +113,8 @@ public class RemoveFromGlobalLoadBalancerRuleCmd extends BaseAsyncCmd {
@Override
public void execute() {
- CallContext.current().setEventDetails("Global Load balancer rule Id: " + getGlobalLoadBalancerRuleId() + " VmIds: " + StringUtils.join(getLoadBalancerRulesIds(), ","));
+ CallContext.current().setEventDetails(
+ "Global Load balancer rule Id: " + getGlobalLoadBalancerRuleId() + " VmIds: " + StringUtils.join(getLoadBalancerRulesIds(), ","));
boolean result = _gslbService.removeFromGlobalLoadBalancerRule(this);
if (result) {
SuccessResponse response = new SuccessResponse(getCommandName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java
index 015d97d..e8c5326 100644
--- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java
@@ -17,16 +17,22 @@
package org.apache.cloudstack.api.command.user.region.ha.gslb;
+import javax.inject.Inject;
+
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.GlobalLoadBalancerResponse;
+
import com.cloud.event.EventTypes;
import com.cloud.region.ha.GlobalLoadBalancerRule;
import com.cloud.region.ha.GlobalLoadBalancingRulesService;
import com.cloud.user.Account;
-import org.apache.cloudstack.api.*;
-import org.apache.cloudstack.api.response.GlobalLoadBalancerResponse;
-import org.apache.cloudstack.api.response.LoadBalancerResponse;
-import org.apache.log4j.Logger;
-
-import javax.inject.Inject;
@APICommand(name = "updateGlobalLoadBalancerRule", description = "update global load balancer rules.", responseObject = GlobalLoadBalancerResponse.class)
public class UpdateGlobalLoadBalancerRuleCmd extends BaseAsyncCmd {
@@ -52,7 +58,7 @@ public class UpdateGlobalLoadBalancerRuleCmd extends BaseAsyncCmd {
type = CommandType.STRING,
required = false,
description = "load balancer algorithm (roundrobin, leastconn, proximity) "
- + "that is used to distributed traffic across the zones participating in global server load balancing, if not specified defaults to 'round robin'")
+ + "that is used to distributed traffic across the zones participating in global server load balancing, if not specified defaults to 'round robin'")
private String algorithm;
@Parameter(name = ApiConstants.GSLB_STICKY_SESSION_METHOD,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java
index 181f804..ccaca2d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.resource;
import java.util.ArrayList;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.CloudIdentifierResponse;
import org.apache.cloudstack.api.response.UserResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
@@ -39,7 +40,11 @@ public class GetCloudIdentifierCmd extends BaseCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.USER_ID, type = CommandType.UUID, entityType = UserResponse.class, required = true, description = "the user ID for the cloud identifier")
+ @Parameter(name = ApiConstants.USER_ID,
+ type = CommandType.UUID,
+ entityType = UserResponse.class,
+ required = true,
+ description = "the user ID for the cloud identifier")
private Long userid;
/////////////////////////////////////////////////////
@@ -54,6 +59,7 @@ public class GetCloudIdentifierCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
+ @Override
public String getCommandName() {
return s_name;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java
index a2c84de..5e546f4 100644
--- a/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.resource;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
@@ -27,7 +29,6 @@ import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd;
import org.apache.cloudstack.api.response.HypervisorResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java
index 6c35387..ba3cfc8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java
@@ -19,16 +19,16 @@ package org.apache.cloudstack.api.command.user.resource;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ResourceLimitResponse;
-import org.apache.log4j.Logger;
import com.cloud.configuration.ResourceLimit;
-import com.cloud.configuration.Resource.ResourceOwnerType;
@APICommand(name = "listResourceLimits", description = "Lists resource limits.", responseObject = ResourceLimitResponse.class)
public class ListResourceLimitsCmd extends BaseListProjectAndAccountResourcesCmd {
@@ -43,16 +43,14 @@ public class ListResourceLimitsCmd extends BaseListProjectAndAccountResourcesCmd
@Parameter(name = ApiConstants.ID, type = CommandType.LONG, description = "Lists resource limits by ID.")
private Long id;
- @Parameter(name = ApiConstants.RESOURCE_TYPE,
- type = CommandType.INTEGER,
- description = "Type of resource to update. Values are 0, 1, 2, 3, and 4." + "0 - Instance. Number of instances a user can create. "
- + "1 - IP. Number of public IP addresses an account can own. " + "2 - Volume. Number of disk volumes an account can own."
- + "3 - Snapshot. Number of snapshots an account can own." + "4 - Template. Number of templates an account can register/create."
- + "5 - Project. Number of projects an account can own." + "6 - Network. Number of networks an account can own."
- + "7 - VPC. Number of VPC an account can own." + "8 - CPU. Number of CPU an account can allocate for his resources."
- + "9 - Memory. Amount of RAM an account can allocate for his resources."
- + "10 - Primary Storage. Amount of Primary storage an account can allocate for his resoruces."
- + "11 - Secondary Storage. Amount of Secondary storage an account can allocate for his resources.")
+ @Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.INTEGER, description = "Type of resource to update. Values are 0, 1, 2, 3, and 4."
+ + "0 - Instance. Number of instances a user can create. " + "1 - IP. Number of public IP addresses an account can own. "
+ + "2 - Volume. Number of disk volumes an account can own." + "3 - Snapshot. Number of snapshots an account can own."
+ + "4 - Template. Number of templates an account can register/create." + "5 - Project. Number of projects an account can own."
+ + "6 - Network. Number of networks an account can own." + "7 - VPC. Number of VPC an account can own."
+ + "8 - CPU. Number of CPU an account can allocate for his resources." + "9 - Memory. Amount of RAM an account can allocate for his resources."
+ + "10 - Primary Storage. Amount of Primary storage an account can allocate for his resoruces."
+ + "11 - Secondary Storage. Amount of Secondary storage an account can allocate for his resources.")
private Integer resourceType;
/////////////////////////////////////////////////////
@@ -78,8 +76,9 @@ public class ListResourceLimitsCmd extends BaseListProjectAndAccountResourcesCmd
@Override
public void execute() {
- List<? extends ResourceLimit> result = _resourceLimitService.searchForLimits(id, finalyzeAccountId(this.getAccountName(), this.getDomainId(), this.getProjectId(), false),
- this.getDomainId(), resourceType, this.getStartIndex(), this.getPageSizeVal());
+ List<? extends ResourceLimit> result =
+ _resourceLimitService.searchForLimits(id, finalyzeAccountId(this.getAccountName(), this.getDomainId(), this.getProjectId(), false), this.getDomainId(),
+ resourceType, this.getStartIndex(), this.getPageSizeVal());
ListResponse<ResourceLimitResponse> response = new ListResponse<ResourceLimitResponse>();
List<ResourceLimitResponse> limitResponses = new ArrayList<ResourceLimitResponse>();
for (ResourceLimit limit : result) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java
index 351181a..bd4f995 100644
--- a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.resource;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -31,8 +33,6 @@ import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.ResourceCountResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.configuration.ResourceCount;
import com.cloud.user.Account;
@@ -46,7 +46,9 @@ public class UpdateResourceCountCmd extends BaseCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "Update resource count for a specified account. Must be used with the domainId parameter.")
+ @Parameter(name = ApiConstants.ACCOUNT,
+ type = CommandType.STRING,
+ description = "Update resource count for a specified account. Must be used with the domainId parameter.")
private String accountName;
@Parameter(name = ApiConstants.DOMAIN_ID,
@@ -59,13 +61,18 @@ public class UpdateResourceCountCmd extends BaseCmd {
@Parameter(name = ApiConstants.RESOURCE_TYPE,
type = CommandType.INTEGER,
description = "Type of resource to update. If specifies valid values are 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 and 11. If not specified will update all resource counts"
- + "0 - Instance. Number of instances a user can create. " + "1 - IP. Number of public IP addresses a user can own. "
- + "2 - Volume. Number of disk volumes a user can create." + "3 - Snapshot. Number of snapshots a user can create."
- + "4 - Template. Number of templates that a user can register/create." + "5 - Project. Number of projects that a user can create."
- + "6 - Network. Number of guest network a user can create." + "7 - VPC. Number of VPC a user can create."
- + "8 - CPU. Total number of CPU cores a user can use." + "9 - Memory. Total Memory (in MB) a user can use."
- + "10 - PrimaryStorage. Total primary storage space (in GiB) a user can use."
- + "11 - SecondaryStorage. Total secondary storage space (in GiB) a user can use.")
+ + "0 - Instance. Number of instances a user can create. "
+ + "1 - IP. Number of public IP addresses a user can own. "
+ + "2 - Volume. Number of disk volumes a user can create."
+ + "3 - Snapshot. Number of snapshots a user can create."
+ + "4 - Template. Number of templates that a user can register/create."
+ + "5 - Project. Number of projects that a user can create."
+ + "6 - Network. Number of guest network a user can create."
+ + "7 - VPC. Number of VPC a user can create."
+ + "8 - CPU. Total number of CPU cores a user can use."
+ + "9 - Memory. Total Memory (in MB) a user can use."
+ + "10 - PrimaryStorage. Total primary storage space (in GiB) a user can use."
+ + "11 - SecondaryStorage. Total secondary storage space (in GiB) a user can use.")
private Integer resourceType;
@Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "Update resource limits for project")
@@ -117,8 +124,8 @@ public class UpdateResourceCountCmd extends BaseCmd {
@Override
public void execute() {
- List<? extends ResourceCount> result = _resourceLimitService.recalculateResourceCount(finalyzeAccountId(accountName, domainId, projectId, true), getDomainId(),
- getResourceType());
+ List<? extends ResourceCount> result =
+ _resourceLimitService.recalculateResourceCount(finalyzeAccountId(accountName, domainId, projectId, true), getDomainId(), getResourceType());
if ((result != null) && (result.size() > 0)) {
ListResponse<ResourceCountResponse> response = new ListResponse<ResourceCountResponse>();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java
index f29b828..c33a9e7 100644
--- a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.resource;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.ResourceLimitResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.configuration.ResourceLimit;
@APICommand(name = "updateResourceLimit", description = "Updates resource limits for an account or domain.", responseObject = ResourceLimitResponse.class)
@@ -60,12 +60,12 @@ public class UpdateResourceLimitCmd extends BaseCmd {
type = CommandType.INTEGER,
required = true,
description = "Type of resource to update. Values are 0, 1, 2, 3, 4, 6, 7, 8, 9, 10 and 11. 0 - Instance. Number of instances a user can create. "
- + "1 - IP. Number of public IP addresses a user can own. " + "2 - Volume. Number of disk volumes a user can create."
- + "3 - Snapshot. Number of snapshots a user can create." + "4 - Template. Number of templates that a user can register/create."
- + "6 - Network. Number of guest network a user can create." + "7 - VPC. Number of VPC a user can create."
- + "8 - CPU. Total number of CPU cores a user can use." + "9 - Memory. Total Memory (in MB) a user can use."
- + "10 - PrimaryStorage. Total primary storage space (in GiB) a user can use."
- + "11 - SecondaryStorage. Total secondary storage space (in GiB) a user can use.")
+ + "1 - IP. Number of public IP addresses a user can own. " + "2 - Volume. Number of disk volumes a user can create."
+ + "3 - Snapshot. Number of snapshots a user can create." + "4 - Template. Number of templates that a user can register/create."
+ + "6 - Network. Number of guest network a user can create." + "7 - VPC. Number of VPC a user can create."
+ + "8 - CPU. Total number of CPU cores a user can use." + "9 - Memory. Total Memory (in MB) a user can use."
+ + "10 - PrimaryStorage. Total primary storage space (in GiB) a user can use."
+ + "11 - SecondaryStorage. Total secondary storage space (in GiB) a user can use.")
private Integer resourceType;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
index d10c37e..6a054a4 100644
--- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
@@ -22,6 +22,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -35,8 +37,6 @@ import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.SecurityGroupRuleResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.security.SecurityRule;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
index 9f01dd6..be91959 100644
--- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
@@ -22,6 +22,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -35,15 +37,14 @@ import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.SecurityGroupRuleResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.security.SecurityRule;
import com.cloud.utils.StringUtils;
-import com.cloud.utils.net.NetUtils;
-@APICommand(name = "authorizeSecurityGroupIngress", responseObject = SecurityGroupRuleResponse.class, description = "Authorizes a particular ingress rule for this security group")
+@APICommand(name = "authorizeSecurityGroupIngress",
+ responseObject = SecurityGroupRuleResponse.class,
+ description = "Authorizes a particular ingress rule for this security group")
@SuppressWarnings("rawtypes")
public class AuthorizeSecurityGroupIngressCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AuthorizeSecurityGroupIngressCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java
index 00b235a..3b16821 100644
--- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.securitygroup;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.network.security.SecurityGroup;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java
index 3e65811..0bcc144 100644
--- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.securitygroup;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceInUseException;
@@ -45,7 +45,10 @@ public class DeleteSecurityGroupCmd extends BaseCmd {
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the account of the security group. Must be specified with domain ID")
private String accountName;
- @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, description = "the domain ID of account owning the security group", entityType = DomainResponse.class)
+ @Parameter(name = ApiConstants.DOMAIN_ID,
+ type = CommandType.UUID,
+ description = "the domain ID of account owning the security group",
+ entityType = DomainResponse.class)
private Long domainId;
@Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, description = "the project of the security group", entityType = ProjectResponse.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java
index 950dd80..ae745b3 100644
--- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.securitygroup;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.log4j.Logger;
@APICommand(name = "listSecurityGroups", description = "Lists security groups", responseObject = SecurityGroupResponse.class)
public class ListSecurityGroupsCmd extends BaseListTaggedResourcesCmd {
@@ -39,7 +40,10 @@ public class ListSecurityGroupsCmd extends BaseListTaggedResourcesCmd {
@Parameter(name = ApiConstants.SECURITY_GROUP_NAME, type = CommandType.STRING, description = "lists security groups by name")
private String securityGroupName;
- @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, description = "lists security groups by virtual machine id", entityType = UserVmResponse.class)
+ @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
+ type = CommandType.UUID,
+ description = "lists security groups by virtual machine id",
+ entityType = UserVmResponse.class)
private Long virtualMachineId;
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, description = "list the security group by the id provided", entityType = SecurityGroupResponse.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java
index 79521cf..006aa7d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.securitygroup;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -25,14 +27,16 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SecurityGroupRuleResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.network.security.SecurityGroup;
import com.cloud.network.security.SecurityRule;
import com.cloud.user.Account;
-@APICommand(name = "revokeSecurityGroupEgress", responseObject = SuccessResponse.class, description = "Deletes a particular egress rule from this security group", since = "3.0.0")
+@APICommand(name = "revokeSecurityGroupEgress",
+ responseObject = SuccessResponse.class,
+ description = "Deletes a particular egress rule from this security group",
+ since = "3.0.0")
public class RevokeSecurityGroupEgressCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RevokeSecurityGroupEgressCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java
index 9433a3e..0858578 100644
--- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.securitygroup;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -25,7 +27,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SecurityGroupRuleResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.network.security.SecurityGroup;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java
index 233d4c4..a0f307b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.snapshot;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -30,8 +32,6 @@ import org.apache.cloudstack.api.response.SnapshotResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
@@ -50,7 +50,9 @@ public class CreateSnapshotCmd extends BaseAsyncCreateCmd {
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "The account of the snapshot. The account parameter must be used with the domainId parameter.")
+ @Parameter(name = ApiConstants.ACCOUNT,
+ type = CommandType.STRING,
+ description = "The account of the snapshot. The account parameter must be used with the domainId parameter.")
private String accountName;
@Parameter(name = ApiConstants.DOMAIN_ID,
@@ -139,7 +141,8 @@ public class CreateSnapshotCmd extends BaseAsyncCreateCmd {
if (account.getType() == Account.ACCOUNT_TYPE_PROJECT) {
Project project = _projectService.findByProjectAccountId(volume.getAccountId());
if (project.getState() != Project.State.Active) {
- throw new PermissionDeniedException("Can't add resources to the project id=" + project.getId() + " in state=" + project.getState() + " as it's no longer active");
+ throw new PermissionDeniedException("Can't add resources to the project id=" + project.getId() + " in state=" + project.getState() +
+ " as it's no longer active");
}
} else if (account.getState() == Account.State.disabled) {
throw new PermissionDeniedException("The owner of template is disabled: " + account);
@@ -180,7 +183,8 @@ public class CreateSnapshotCmd extends BaseAsyncCreateCmd {
CallContext.current().setEventDetails("Volume Id: " + getVolumeId());
Snapshot snapshot;
try {
- snapshot = _volumeService.takeSnapshot(this.getVolumeId(), this.getPolicyId(), this.getEntityId(), _accountService.getAccount(getEntityOwnerId()), getQuiescevm());
+ snapshot =
+ _volumeService.takeSnapshot(this.getVolumeId(), this.getPolicyId(), this.getEntityId(), _accountService.getAccount(getEntityOwnerId()), getQuiescevm());
if (snapshot != null) {
SnapshotResponse response = _responseGenerator.createSnapshotResponse(snapshot);
response.setResponseName(getCommandName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java
index 01c19b8..5ecbaaa 100644
--- a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.snapshot;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SnapshotPolicyResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
@@ -50,8 +51,7 @@ public class CreateSnapshotPolicyCmd extends BaseCmd {
private Integer maxSnaps;
@Parameter(name = ApiConstants.SCHEDULE, type = CommandType.STRING, required = true, description = "time the snapshot is scheduled to be taken. " + "Format is:"
- + "* if HOURLY, MM" + "* if DAILY, MM:HH" + "* if WEEKLY, MM:HH:DD (1-7)"
- + "* if MONTHLY, MM:HH:DD (1-28)")
+ + "* if HOURLY, MM" + "* if DAILY, MM:HH" + "* if WEEKLY, MM:HH:DD (1-7)" + "* if MONTHLY, MM:HH:DD (1-28)")
private String schedule;
@Parameter(name = ApiConstants.TIMEZONE,
@@ -108,8 +108,8 @@ public class CreateSnapshotPolicyCmd extends BaseCmd {
if (account.getType() == Account.ACCOUNT_TYPE_PROJECT) {
Project project = _projectService.findByProjectAccountId(volume.getAccountId());
if (project.getState() != Project.State.Active) {
- PermissionDeniedException ex = new PermissionDeniedException("Can't add resources to the specified project id in state=" + project.getState() +
- " as it's no longer active");
+ PermissionDeniedException ex =
+ new PermissionDeniedException("Can't add resources to the specified project id in state=" + project.getState() + " as it's no longer active");
ex.addProxyObject(project.getUuid(), "projectId");
throw ex;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java
index d8bd46f..35caaff 100644
--- a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.snapshot;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.SnapshotResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.storage.Snapshot;
import com.cloud.user.Account;
@@ -82,10 +82,12 @@ public class DeleteSnapshotCmd extends BaseAsyncCmd {
return "deleting snapshot: " + getId();
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Snapshot;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java
index 2e29d26..bcccf8b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.snapshot;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SnapshotPolicyResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java
index 077ed84..7c2899f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.snapshot;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.SnapshotPolicyResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
-import org.apache.log4j.Logger;
import com.cloud.storage.snapshot.SnapshotPolicy;
import com.cloud.utils.Pair;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java
index 040cb05..e4d566a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.snapshot;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -28,7 +30,6 @@ import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.SnapshotResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.storage.Snapshot;
import com.cloud.utils.Pair;
@@ -98,6 +99,7 @@ public class ListSnapshotsCmd extends BaseListTaggedResourcesCmd {
return s_name;
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Snapshot;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java
index b790efa..1fc9d13 100644
--- a/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.ssh;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
@@ -25,8 +27,6 @@ import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.user.SSHKeyPair;
@APICommand(name = "createSSHKeyPair", description = "Create a new keypair and returns the private key", responseObject = CreateSSHKeyPairResponse.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java
index 4a58ee5..a638eb9 100644
--- a/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.ssh;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
@@ -25,8 +27,6 @@ import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.user.Account;
@APICommand(name = "deleteSSHKeyPair", description = "Deletes a keypair by name", responseObject = SuccessResponse.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java
index 0136717..52fca5f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.command.user.ssh;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.SSHKeyPairResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.SSHKeyPair;
import com.cloud.utils.Pair;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java
index 9bb3654..8ed5cbd 100644
--- a/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.ssh;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
@@ -25,8 +27,6 @@ import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.SSHKeyPairResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.user.SSHKeyPair;
@APICommand(name = "registerSSHKeyPair", description = "Register a public key in a keypair under a certain name", responseObject = SSHKeyPairResponse.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java b/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java
index 346173c..ee0add4 100644
--- a/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java
@@ -23,6 +23,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -30,7 +32,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.server.ResourceTag;
@@ -60,7 +61,7 @@ public class CreateTagsCmd extends BaseAsyncCmd {
private List<String> resourceIds;
@Parameter(name = ApiConstants.CUSTOMER, type = CommandType.STRING, description = "identifies client specific tag. "
- + "When the value is not null, the tag can't be used by cloudStack code internally")
+ + "When the value is not null, the tag can't be used by cloudStack code internally")
private String customer;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java b/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java
index 1eaa9a3..3ee7c06 100644
--- a/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java
@@ -23,6 +23,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -30,7 +32,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.server.ResourceTag.ResourceObjectType;
@@ -51,7 +52,11 @@ public class DeleteTagsCmd extends BaseAsyncCmd {
@Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.STRING, required = true, description = "Delete tag by resource type")
private String resourceType;
- @Parameter(name = ApiConstants.RESOURCE_IDS, type = CommandType.LIST, required = true, collectionType = CommandType.STRING, description = "Delete tags for resource id(s)")
+ @Parameter(name = ApiConstants.RESOURCE_IDS,
+ type = CommandType.LIST,
+ required = true,
+ collectionType = CommandType.STRING,
+ description = "Delete tags for resource id(s)")
private List<String> resourceIds;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java
index 83fd4e7..78bfc18 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.template;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,12 +28,9 @@ import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.TemplateResponse;
-import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.StorageUnavailableException;
@@ -114,10 +113,12 @@ public class CopyTemplateCmd extends BaseAsyncCmd {
return "copying template: " + getId() + " from zone: " + getSourceZoneId() + " to zone: " + getDestinationZoneId();
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Template;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
index 3f05f6c..0030a7e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
@@ -16,15 +16,11 @@
// under the License.
package org.apache.cloudstack.api.command.user.template;
-import com.cloud.event.EventTypes;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.exception.PermissionDeniedException;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.projects.Project;
-import com.cloud.storage.Snapshot;
-import com.cloud.storage.Volume;
-import com.cloud.template.VirtualMachineTemplate;
-import com.cloud.user.Account;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
@@ -40,16 +36,19 @@ import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import com.cloud.event.EventTypes;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.PermissionDeniedException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.projects.Project;
+import com.cloud.storage.Snapshot;
+import com.cloud.storage.Volume;
+import com.cloud.template.VirtualMachineTemplate;
+import com.cloud.user.Account;
-@APICommand(name = "createTemplate",
- responseObject = TemplateResponse.class,
- description = "Creates a template of a virtual machine. " + "The virtual machine must be in a STOPPED state. "
- + "A template created from this command is automatically designated as a private template visible to the account that created it.")
+@APICommand(name = "createTemplate", responseObject = TemplateResponse.class, description = "Creates a template of a virtual machine. "
+ + "The virtual machine must be in a STOPPED state. "
+ + "A template created from this command is automatically designated as a private template visible to the account that created it.")
public class CreateTemplateCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateTemplateCmd.class.getName());
private static final String s_name = "createtemplateresponse";
@@ -84,7 +83,9 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd {
description = "the ID of the OS Type that best represents the OS of this template.")
private Long osTypeId;
- @Parameter(name = ApiConstants.PASSWORD_ENABLED, type = CommandType.BOOLEAN, description = "true if the template supports the password reset feature; default is false")
+ @Parameter(name = ApiConstants.PASSWORD_ENABLED,
+ type = CommandType.BOOLEAN,
+ description = "true if the template supports the password reset feature; default is false")
private Boolean passwordEnabled;
@Parameter(name = ApiConstants.REQUIRES_HVM, type = CommandType.BOOLEAN, description = "true if the template requres HVM, false otherwise")
@@ -108,7 +109,9 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd {
description = "Optional, VM ID. If this presents, it is going to create a baremetal template for VM this ID refers to. This is only for VM whose hypervisor type is BareMetal")
private Long vmId;
- @Parameter(name = ApiConstants.URL, type = CommandType.STRING, description = "Optional, only for baremetal hypervisor. The directory name where template stored on CIFS server")
+ @Parameter(name = ApiConstants.URL,
+ type = CommandType.STRING,
+ description = "Optional, only for baremetal hypervisor. The directory name where template stored on CIFS server")
private String url;
@Parameter(name = ApiConstants.TEMPLATE_TAG, type = CommandType.STRING, description = "the tag for this template.")
@@ -231,8 +234,8 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd {
if (account.getType() == Account.ACCOUNT_TYPE_PROJECT) {
Project project = _projectService.findByProjectAccountId(accountId);
if (project.getState() != Project.State.Active) {
- PermissionDeniedException ex = new PermissionDeniedException("Can't add resources to the specified project id in state=" + project.getState() +
- " as it's no longer active");
+ PermissionDeniedException ex =
+ new PermissionDeniedException("Can't add resources to the specified project id in state=" + project.getState() + " as it's no longer active");
ex.addProxyObject(project.getUuid(), "projectId");
}
} else if (account.getState() == Account.State.disabled) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
index 043eb9f..890af70 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.template;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
@@ -96,10 +96,12 @@ public class DeleteTemplateCmd extends BaseAsyncCmd {
return "Deleting template " + getId();
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Template;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
index 69c304f..082f46a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.template;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -28,13 +30,10 @@ import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InternalErrorException;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
-import com.cloud.utils.Pair;
@APICommand(name = "extractTemplate", description = "Extracts a template", responseObject = ExtractResponse.class)
public class ExtractTemplateCmd extends BaseAsyncCmd {
@@ -116,10 +115,12 @@ public class ExtractTemplateCmd extends BaseAsyncCmd {
return "extracting template: " + getId() + " from zone: " + getZoneId();
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Template;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java
index c739bba..08acf63 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java
@@ -16,10 +16,11 @@
// under the License.
package org.apache.cloudstack.api.command.user.template;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.BaseListTemplateOrIsoPermissionsCmd;
import org.apache.cloudstack.api.response.TemplatePermissionsResponse;
-import org.apache.log4j.Logger;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.template.VirtualMachineTemplate;
@@ -42,6 +43,7 @@ public class ListTemplatePermissionsCmd extends BaseListTemplateOrIsoPermissions
return Logger.getLogger(ListTemplatePermissionsCmd.class.getName());
}
+ @Override
protected boolean templateIsCorrectType(VirtualMachineTemplate template) {
return !template.getFormat().equals(ImageFormat.ISO);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
index aa1e6b3..7e347f3 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
@@ -16,9 +16,7 @@
// under the License.
package org.apache.cloudstack.api.command.user.template;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
@@ -27,15 +25,11 @@ import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.TemplateResponse;
-import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.template.VirtualMachineTemplate.TemplateFilter;
import com.cloud.user.Account;
-import com.cloud.utils.Pair;
@APICommand(name = "listTemplates", description = "List all public, private, and privileged templates.", responseObject = TemplateResponse.class)
public class ListTemplatesCmd extends BaseListTaggedResourcesCmd {
@@ -60,12 +54,12 @@ public class ListTemplatesCmd extends BaseListTaggedResourcesCmd {
type = CommandType.STRING,
required = true,
description = "possible values are \"featured\", \"self\", \"selfexecutable\",\"sharedexecutable\",\"executable\", and \"community\". "
- + "* featured : templates that have been marked as featured and public. "
- + "* self : templates that have been registered or created by the calling user. "
- + "* selfexecutable : same as self, but only returns templates that can be used to deploy a new VM. "
- + "* sharedexecutable : templates ready to be deployed that have been granted to the calling user by another user. "
- + "* executable : templates that are owned by the calling user, or public templates, that can be used to deploy a VM. "
- + "* community : templates that have been marked as public but not featured. " + "* all : all templates (only usable by admins).")
+ + "* featured : templates that have been marked as featured and public. "
+ + "* self : templates that have been registered or created by the calling user. "
+ + "* selfexecutable : same as self, but only returns templates that can be used to deploy a new VM. "
+ + "* sharedexecutable : templates ready to be deployed that have been granted to the calling user by another user. "
+ + "* executable : templates that are owned by the calling user, or public templates, that can be used to deploy a VM. "
+ + "* community : templates that have been marked as public but not featured. " + "* all : all templates (only usable by admins).")
private String templateFilter;
@Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "list templates by zoneId")
@@ -102,9 +96,9 @@ public class ListTemplatesCmd extends BaseListTaggedResourcesCmd {
boolean isAccountSpecific = (account == null || isAdmin(account.getType())) && (getAccountName() != null) && (getDomainId() != null);
// Show only those that are downloaded.
TemplateFilter templateFilter = TemplateFilter.valueOf(getTemplateFilter());
- boolean onlyReady = (templateFilter == TemplateFilter.featured) || (templateFilter == TemplateFilter.selfexecutable) ||
- (templateFilter == TemplateFilter.sharedexecutable) || (templateFilter == TemplateFilter.executable && isAccountSpecific) ||
- (templateFilter == TemplateFilter.community);
+ boolean onlyReady =
+ (templateFilter == TemplateFilter.featured) || (templateFilter == TemplateFilter.selfexecutable) || (templateFilter == TemplateFilter.sharedexecutable) ||
+ (templateFilter == TemplateFilter.executable && isAccountSpecific) || (templateFilter == TemplateFilter.community);
return onlyReady;
}
@@ -117,6 +111,7 @@ public class ListTemplatesCmd extends BaseListTaggedResourcesCmd {
return s_name;
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Template;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
index d31ae03..48ed6ea 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
@@ -21,6 +21,8 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -36,8 +38,6 @@ import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.exception.ResourceAllocationException;
import com.cloud.template.VirtualMachineTemplate;
@@ -61,7 +61,10 @@ public class RegisterTemplateCmd extends BaseCmd {
length = 4096)
private String displayText;
- @Parameter(name = ApiConstants.FORMAT, type = CommandType.STRING, required = true, description = "the format for the template. Possible values include QCOW2, RAW, and VHD.")
+ @Parameter(name = ApiConstants.FORMAT,
+ type = CommandType.STRING,
+ required = true,
+ description = "the format for the template. Possible values include QCOW2, RAW, and VHD.")
private String format;
@Parameter(name = ApiConstants.HYPERVISOR, type = CommandType.STRING, required = true, description = "the target hypervisor for the template")
@@ -83,7 +86,9 @@ public class RegisterTemplateCmd extends BaseCmd {
description = "the ID of the OS Type that best represents the OS of this template.")
private Long osTypeId;
- @Parameter(name = ApiConstants.PASSWORD_ENABLED, type = CommandType.BOOLEAN, description = "true if the template supports the password reset feature; default is false")
+ @Parameter(name = ApiConstants.PASSWORD_ENABLED,
+ type = CommandType.BOOLEAN,
+ description = "true if the template supports the password reset feature; default is false")
private Boolean passwordEnabled;
@Parameter(name = ApiConstants.SSHKEY_ENABLED, type = CommandType.BOOLEAN, description = "true if the template supports the sshkey upload feature; default is false")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java
index eb26d25..f80a4ee 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java
@@ -16,12 +16,13 @@
// under the License.
package org.apache.cloudstack.api.command.user.template;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseUpdateTemplateOrIsoCmd;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.TemplateResponse;
-import org.apache.log4j.Logger;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java
index 610001f..96d1f55 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java
@@ -16,24 +16,25 @@
// under the License.
package org.apache.cloudstack.api.command.user.template;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.BaseUpdateTemplateOrIsoPermissionsCmd;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
-@APICommand(name = "updateTemplatePermissions",
- responseObject = SuccessResponse.class,
- description = "Updates a template visibility permissions. " + "A public template is visible to all accounts within the same domain. "
- + "A private template is visible only to the owner of the template. " + "A priviledged template is a private template with account permissions added. "
- + "Only accounts specified under the template permissions are visible to them.")
+@APICommand(name = "updateTemplatePermissions", responseObject = SuccessResponse.class, description = "Updates a template visibility permissions. "
+ + "A public template is visible to all accounts within the same domain. " + "A private template is visible only to the owner of the template. "
+ + "A priviledged template is a private template with account permissions added. " + "Only accounts specified under the template permissions are visible to them.")
public class UpdateTemplatePermissionsCmd extends BaseUpdateTemplateOrIsoPermissionsCmd {
+ @Override
protected String getResponseName() {
return "updatetemplatepermissionsresponse";
}
+ @Override
protected Logger getLogger() {
return Logger.getLogger(UpdateTemplatePermissionsCmd.class.getName());
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
index 76bc5cf..09a9122 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
@@ -16,8 +16,6 @@
// under the License.
package org.apache.cloudstack.api.command.user.vm;
-import com.cloud.vm.NicSecondaryIp;
-
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
@@ -44,6 +42,7 @@ import com.cloud.network.Network;
import com.cloud.user.Account;
import com.cloud.utils.net.NetUtils;
import com.cloud.vm.Nic;
+import com.cloud.vm.NicSecondaryIp;
@APICommand(name = "addIpToNic", description = "Assigns secondary IP to NIC", responseObject = NicSecondaryIpResponse.class)
public class AddIpToVmNicCmd extends BaseAsyncCmd {
@@ -167,7 +166,7 @@ public class AddIpToVmNicCmd extends BaseAsyncCmd {
if (getNetworkType() == NetworkType.Basic) {
// add security group rules for the secondary ip addresses
boolean success = false;
- success = _securityGroupService.securityGroupRulesForVmSecIp(getNicId(), getNetworkId(), secondaryIp, (boolean)true);
+ success = _securityGroupService.securityGroupRulesForVmSecIp(getNicId(), getNetworkId(), secondaryIp, true);
if (success == false) {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to set security group rules for the secondary ip");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java
index aeac82b..43efe16 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java
@@ -21,17 +21,18 @@ import java.util.EnumSet;
import org.apache.log4j.Logger;
-import org.apache.cloudstack.api.*;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiConstants.VMDetails;
-import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.NetworkResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
import com.cloud.event.EventTypes;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
[08/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java b/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java
index 16c99bb..788f35a 100644
--- a/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java
+++ b/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java
@@ -45,6 +45,7 @@ import org.w3c.dom.NodeList;
import com.amazon.s3.GetBucketAccessControlPolicyResponse;
import com.amazon.s3.ListAllMyBucketsResponse;
import com.amazon.s3.ListBucketResponse;
+
import com.cloud.bridge.io.MTOMAwareResultStreamWriter;
import com.cloud.bridge.model.BucketPolicyVO;
import com.cloud.bridge.model.SAcl;
@@ -93,7 +94,6 @@ import com.cloud.bridge.util.StringHelper;
import com.cloud.bridge.util.XSerializer;
import com.cloud.bridge.util.XSerializerXmlAdapter;
import com.cloud.bridge.util.XmlHelper;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
public class S3BucketAction implements ServletAction {
@@ -772,7 +772,8 @@ public class S3BucketAction implements ServletAction {
response.flushBuffer();
} catch (ObjectAlreadyExistsException oaee) {
response.setStatus(409);
- String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> <Error><Code>OperationAborted</Code><Message>A conflicting conditional operation is currently in progress against this resource. Please try again..</Message>";
+ String xml =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?> <Error><Code>OperationAborted</Code><Message>A conflicting conditional operation is currently in progress against this resource. Please try again..</Message>";
response.setContentType("text/xml; charset=UTF-8");
S3RestServlet.endResponse(response, xml.toString());
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java b/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java
index 22310a5..c854323 100644
--- a/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java
+++ b/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java
@@ -44,6 +44,7 @@ import org.w3c.dom.NodeList;
import com.amazon.s3.CopyObjectResponse;
import com.amazon.s3.GetObjectAccessControlPolicyResponse;
+
import com.cloud.bridge.io.MTOMAwareResultStreamWriter;
import com.cloud.bridge.model.SAcl;
import com.cloud.bridge.model.SAclVO;
@@ -342,7 +343,8 @@ public class S3ObjectAction implements ServletAction {
DataHandler dataHandler = engineResponse.getData();
if (dataHandler != null) {
response.addHeader("ETag", "\"" + engineResponse.getETag() + "\"");
- response.addHeader("Last-Modified", DateHelper.getDateDisplayString(DateHelper.GMT_TIMEZONE, engineResponse.getLastModified().getTime(), "E, d MMM yyyy HH:mm:ss z"));
+ response.addHeader("Last-Modified",
+ DateHelper.getDateDisplayString(DateHelper.GMT_TIMEZONE, engineResponse.getLastModified().getTime(), "E, d MMM yyyy HH:mm:ss z"));
response.setContentLength((int)engineResponse.getContentLength());
S3RestServlet.writeResponse(response, dataHandler.getInputStream());
@@ -493,7 +495,8 @@ public class S3ObjectAction implements ServletAction {
DataHandler dataHandler = engineResponse.getData();
if (dataHandler != null) {
response.addHeader("ETag", "\"" + engineResponse.getETag() + "\"");
- response.addHeader("Last-Modified", DateHelper.getDateDisplayString(DateHelper.GMT_TIMEZONE, engineResponse.getLastModified().getTime(), "E, d MMM yyyy HH:mm:ss z"));
+ response.addHeader("Last-Modified",
+ DateHelper.getDateDisplayString(DateHelper.GMT_TIMEZONE, engineResponse.getLastModified().getTime(), "E, d MMM yyyy HH:mm:ss z"));
response.setContentLength((int)engineResponse.getContentLength());
}
@@ -1035,10 +1038,10 @@ public class S3ObjectAction implements ServletAction {
}
// -> cannot have HTTP separators in an HTTP header
- if (-1 != name.indexOf('(') || -1 != name.indexOf(')') || -1 != name.indexOf('@') || -1 != name.indexOf('<') || -1 != name.indexOf('>') || -1 != name.indexOf('\"') ||
- -1 != name.indexOf('[') || -1 != name.indexOf(']') || -1 != name.indexOf('=') || -1 != name.indexOf(',') || -1 != name.indexOf(';') || -1 != name.indexOf(':') ||
- -1 != name.indexOf('\\') || -1 != name.indexOf('/') || -1 != name.indexOf(' ') || -1 != name.indexOf('{') || -1 != name.indexOf('}') || -1 != name.indexOf('?') ||
- -1 != name.indexOf('\t'))
+ if (-1 != name.indexOf('(') || -1 != name.indexOf(')') || -1 != name.indexOf('@') || -1 != name.indexOf('<') || -1 != name.indexOf('>') ||
+ -1 != name.indexOf('\"') || -1 != name.indexOf('[') || -1 != name.indexOf(']') || -1 != name.indexOf('=') || -1 != name.indexOf(',') ||
+ -1 != name.indexOf(';') || -1 != name.indexOf(':') || -1 != name.indexOf('\\') || -1 != name.indexOf('/') || -1 != name.indexOf(' ') ||
+ -1 != name.indexOf('{') || -1 != name.indexOf('}') || -1 != name.indexOf('?') || -1 != name.indexOf('\t'))
ignoreMeta = true;
if (ignoreMeta)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java b/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java
index 66f6c6d..842ca4a 100644
--- a/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java
+++ b/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java
@@ -26,9 +26,8 @@ import com.amazon.s3.AccessControlPolicy;
import com.amazon.s3.AmazonS3SkeletonInterface;
import com.amazon.s3.CanonicalUser;
import com.amazon.s3.CopyObject;
-import com.amazon.s3.CopyObjectResult;
-import com.amazon.s3.Group;
import com.amazon.s3.CopyObjectResponse;
+import com.amazon.s3.CopyObjectResult;
import com.amazon.s3.CreateBucket;
import com.amazon.s3.CreateBucketResponse;
import com.amazon.s3.CreateBucketResult;
@@ -49,6 +48,7 @@ import com.amazon.s3.GetObjectResponse;
import com.amazon.s3.GetObjectResult;
import com.amazon.s3.Grant;
import com.amazon.s3.Grantee;
+import com.amazon.s3.Group;
import com.amazon.s3.ListAllMyBuckets;
import com.amazon.s3.ListAllMyBucketsEntry;
import com.amazon.s3.ListAllMyBucketsList;
@@ -75,6 +75,7 @@ import com.amazon.s3.SetObjectAccessControlPolicy;
import com.amazon.s3.SetObjectAccessControlPolicyResponse;
import com.amazon.s3.Status;
import com.amazon.s3.StorageClass;
+
import com.cloud.bridge.model.SAcl;
import com.cloud.bridge.service.core.s3.S3AccessControlList;
import com.cloud.bridge.service.core.s3.S3AccessControlPolicy;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java b/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
index c315db0..deb886f 100644
--- a/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
+++ b/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
@@ -34,13 +34,15 @@ import javax.annotation.PostConstruct;
import javax.inject.Inject;
import org.apache.axis2.AxisFault;
-import org.apache.cloudstack.managed.context.ManagedContextTimerTask;
import org.apache.log4j.Logger;
import org.apache.log4j.xml.DOMConfigurator;
import org.springframework.stereotype.Component;
import com.amazon.ec2.AmazonEC2SkeletonInterface;
import com.amazon.s3.AmazonS3SkeletonInterface;
+
+import org.apache.cloudstack.managed.context.ManagedContextTimerTask;
+
import com.cloud.bridge.model.MHostVO;
import com.cloud.bridge.model.SHost;
import com.cloud.bridge.model.SHostVO;
@@ -60,7 +62,6 @@ import com.cloud.bridge.util.NetHelper;
import com.cloud.bridge.util.OrderedPair;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
@Component
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
index cb3beec..59abca0 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
@@ -363,11 +363,13 @@ public class EC2Engine extends ManagerBase {
}
CloudStackSecurityGroup resp = null;
if (ipPerm.getProtocol().equalsIgnoreCase("icmp")) {
- resp = getApi().authorizeSecurityGroupIngress(null, constructList(ipPerm.getIpRangeSet()), null, null, ipPerm.getIcmpCode(), ipPerm.getIcmpType(),
- ipPerm.getProtocol(), null, request.getName(), null, secGroupList);
+ resp =
+ getApi().authorizeSecurityGroupIngress(null, constructList(ipPerm.getIpRangeSet()), null, null, ipPerm.getIcmpCode(), ipPerm.getIcmpType(),
+ ipPerm.getProtocol(), null, request.getName(), null, secGroupList);
} else {
- resp = getApi().authorizeSecurityGroupIngress(null, constructList(ipPerm.getIpRangeSet()), null, ipPerm.getToPort().longValue(), null, null,
- ipPerm.getProtocol(), null, request.getName(), ipPerm.getFromPort().longValue(), secGroupList);
+ resp =
+ getApi().authorizeSecurityGroupIngress(null, constructList(ipPerm.getIpRangeSet()), null, ipPerm.getToPort().longValue(), null, null,
+ ipPerm.getProtocol(), null, request.getName(), ipPerm.getFromPort().longValue(), secGroupList);
}
if (resp != null) {
List<CloudStackIngressRule> ingressRules = resp.getIngressRules();
@@ -805,8 +807,8 @@ public class EC2Engine extends ManagerBase {
throw new Exception("Specified ipAddress doesn't exist");
CloudStackIpAddress cloudIp = cloudIps.get(0);
- List<CloudStackUserVm> vmList = getApi().listVirtualMachines(null, null, true, null, null, null, null, request.getInstanceId(), null, null, null, null, null, null,
- null, null, null);
+ List<CloudStackUserVm> vmList =
+ getApi().listVirtualMachines(null, null, true, null, null, null, null, request.getInstanceId(), null, null, null, null, null, null, null, null, null);
if (vmList == null || vmList.size() == 0) {
throw new Exception("Instance not found");
}
@@ -962,8 +964,9 @@ public class EC2Engine extends ManagerBase {
EC2Image[] imageSet = images.getImageSet();
String osTypeId = imageSet[0].getOsTypeId();
- CloudStackTemplate resp = getApi().createTemplate((request.getDescription() == null ? "" : request.getDescription()), request.getName(), osTypeId, null, null, null,
- null, null, null, volumeId);
+ CloudStackTemplate resp =
+ getApi().createTemplate((request.getDescription() == null ? "" : request.getDescription()), request.getName(), osTypeId, null, null, null, null, null,
+ null, volumeId);
if (resp == null || resp.getId() == null) {
throw new Exception("Image couldn't be created");
}
@@ -992,9 +995,10 @@ public class EC2Engine extends ManagerBase {
public EC2CreateImageResponse registerImage(EC2RegisterImage request) {
EC2CreateImageResponse image = new EC2CreateImageResponse();
try {
- List<CloudStackTemplate> templates = getApi().registerTemplate((request.getDescription() == null ? request.getName() : request.getDescription()), request.getFormat(),
- request.getHypervisor(), request.getName(), toOSTypeId(request.getOsTypeName()), request.getLocation(), toZoneId(request.getZoneName(), null), null, null, null,
- null, null, null, null, null, null);
+ List<CloudStackTemplate> templates =
+ getApi().registerTemplate((request.getDescription() == null ? request.getName() : request.getDescription()), request.getFormat(),
+ request.getHypervisor(), request.getName(), toOSTypeId(request.getOsTypeName()), request.getLocation(), toZoneId(request.getZoneName(), null), null,
+ null, null, null, null, null, null, null, null);
if (templates != null) {
// technically we will only ever register a single template...
for (CloudStackTemplate template : templates) {
@@ -1214,7 +1218,8 @@ public class EC2Engine extends ManagerBase {
}
// // -> no volume name is given in the Amazon request but is required in the cloud API
- CloudStackVolume vol = getApi().createVolume(UUID.randomUUID().toString(), null, diskOfferingId, null, size, snapshotId, toZoneId(request.getZoneName(), null));
+ CloudStackVolume vol =
+ getApi().createVolume(UUID.randomUUID().toString(), null, diskOfferingId, null, size, snapshotId, toZoneId(request.getZoneName(), null));
if (vol != null) {
resp.setAttached(vol.getAttached());
resp.setCreated(vol.getCreated());
@@ -1436,8 +1441,9 @@ public class EC2Engine extends ManagerBase {
// now actually deploy the vms
for (int i = 0; i < createInstances; i++) {
try {
- CloudStackUserVm resp = getApi().deployVirtualMachine(svcOffering.getId(), request.getTemplateId(), zoneId, null, null, null, null, null, null, null,
- request.getKeyName(), null, null, groupIds, groupNames, request.getSize().longValue(), request.getUserData());
+ CloudStackUserVm resp =
+ getApi().deployVirtualMachine(svcOffering.getId(), request.getTemplateId(), zoneId, null, null, null, null, null, null, null,
+ request.getKeyName(), null, null, groupIds, groupNames, request.getSize().longValue(), request.getUserData());
EC2Instance vm = new EC2Instance();
vm.setId(resp.getId().toString());
vm.setName(resp.getName());
@@ -1659,7 +1665,8 @@ public class EC2Engine extends ManagerBase {
* @param virtualMachineIds - an array of instances we are interested in getting information on
* @param ifs - filter out unwanted instances
*/
- private EC2DescribeInstancesResponse listVirtualMachines(String[] virtualMachineIds, EC2InstanceFilterSet ifs, List<CloudStackKeyValue> resourceTags) throws Exception {
+ private EC2DescribeInstancesResponse listVirtualMachines(String[] virtualMachineIds, EC2InstanceFilterSet ifs, List<CloudStackKeyValue> resourceTags)
+ throws Exception {
EC2DescribeInstancesResponse instances = new EC2DescribeInstancesResponse();
if (null == virtualMachineIds || 0 == virtualMachineIds.length) {
@@ -1873,10 +1880,12 @@ public class EC2Engine extends ManagerBase {
* @return the same object passed in as the "instances" parameter modified with one or more
* EC2Instance objects loaded.
*/
- private EC2DescribeInstancesResponse lookupInstances(String instanceId, EC2DescribeInstancesResponse instances, List<CloudStackKeyValue> resourceTagSet) throws Exception {
+ private EC2DescribeInstancesResponse lookupInstances(String instanceId, EC2DescribeInstancesResponse instances, List<CloudStackKeyValue> resourceTagSet)
+ throws Exception {
String instId = instanceId != null ? instanceId : null;
- List<CloudStackUserVm> vms = getApi().listVirtualMachines(null, null, true, null, null, null, null, instId, null, null, null, null, null, null, null, null, resourceTagSet);
+ List<CloudStackUserVm> vms =
+ getApi().listVirtualMachines(null, null, true, null, null, null, null, instId, null, null, null, null, null, null, null, null, resourceTagSet);
if (vms != null && vms.size() > 0) {
for (CloudStackUserVm cloudVm : vms) {
@@ -2291,8 +2300,8 @@ public class EC2Engine extends ManagerBase {
* @throws Exception
*/
private CloudStackNetwork createDefaultGuestNetwork(String zoneId, CloudStackNetworkOffering offering, CloudStackAccount owner) throws Exception {
- return getApi().createNetwork(owner.getName() + "-network", owner.getName() + "-network", offering.getId(), zoneId, owner.getName(), owner.getDomainId(), true, null, null,
- null, null, null, null, null, null);
+ return getApi().createNetwork(owner.getName() + "-network", owner.getName() + "-network", offering.getId(), zoneId, owner.getName(), owner.getDomainId(), true,
+ null, null, null, null, null, null, null, null);
}
/**
@@ -2679,8 +2688,8 @@ public class EC2Engine extends ManagerBase {
if (errorMessage.contains("Object vm_instance(uuid:") && errorMessage.contains(") does not exist")) {
throw new EC2ServiceException(ClientError.InvalidInstanceID_NotFound, "Specified Instance ID does not exist");
} else if (errorMessage.contains("Unable to find security group by name") || errorMessage.contains("Unable to find security group") ||
- (errorMessage.contains("Object security_group(uuid:") && errorMessage.contains(") does not exist")) ||
- errorMessage.contains("Unable to find group by name ")) {
+ (errorMessage.contains("Object security_group(uuid:") && errorMessage.contains(") does not exist")) ||
+ errorMessage.contains("Unable to find group by name ")) {
throw new EC2ServiceException(ClientError.InvalidGroup_NotFound, "Specified Security Group does not exist");
} else if (errorMessage.contains("Invalid port numbers")) {
throw new EC2ServiceException(ClientError.InvalidPermission_Malformed, "Specified Port value is invalid");
@@ -2699,7 +2708,7 @@ public class EC2Engine extends ManagerBase {
} else if (errorMessage.contains("Object snapshots(uuid:") && errorMessage.contains(") does not exist")) {
throw new EC2ServiceException(ClientError.InvalidSnapshot_NotFound, "Specified Snapshot ID doesn't exist");
} else if ((errorMessage.contains("A key pair with name '") && errorMessage.contains("' does not exist")) ||
- (errorMessage.contains("A key pair with name '") && errorMessage.contains("' was not found"))) {
+ (errorMessage.contains("A key pair with name '") && errorMessage.contains("' was not found"))) {
throw new EC2ServiceException(ClientError.InvalidKeyPair_NotFound, "Specified Key pair name is invalid");
} else if (errorMessage.contains("A key pair with name '") && errorMessage.contains("' already exists")) {
throw new EC2ServiceException(ClientError.InvalidKeyPair_Duplicate, "Specified Key pair already exists");
@@ -2726,7 +2735,7 @@ public class EC2Engine extends ManagerBase {
} else if (errorMessage.contains("Unable to find tags by parameters specified")) {
throw new EC2ServiceException(ClientError.InvalidParameterValue, "Specified resourceTag for the specified resourceId doesn't exist");
} else if (errorMessage.contains("Failed to enable static nat for the ip address with specified ipId "
- + "as vm with specified vmId is already associated with specified currentIp")) {
+ + "as vm with specified vmId is already associated with specified currentIp")) {
throw new EC2ServiceException(ClientError.InvalidParameterValue, "Specified publicIp is already associated to the specified VM");
} else if (errorMessage.contains("Specified IP address id is not associated with any vm Id")) {
throw new EC2ServiceException(ClientError.InvalidParameterValue, "Specified publicIp is not associated to any VM");
@@ -2773,7 +2782,8 @@ public class EC2Engine extends ManagerBase {
} else if (errorMessage.contains("Template") && errorMessage.contains("has not been completely downloaded")) {
throw new EC2ServiceException(ClientError.InvalidAMIID_NotFound, "Specified ImageId is unavailable");
} else if (errorMessage.contains("cannot stop VM") && errorMessage.contains("when it is in state Starting")) {
- throw new EC2ServiceException(ClientError.IncorrectInstanceState, "Unable to stop. One or more of the specified instances is in an incorrect state 'pending'");
+ throw new EC2ServiceException(ClientError.IncorrectInstanceState,
+ "Unable to stop. One or more of the specified instances is in an incorrect state 'pending'");
} else if (errorMessage.contains("Failed to authorize security group ingress rule(s)")) {
throw new EC2ServiceException(ClientError.InvalidParameterValue, "Specified Ip-permission is invalid" + " or the Ip-permission already exists");
} else if (errorMessage.contains("Failed to reboot vm instance")) {
@@ -2787,7 +2797,8 @@ public class EC2Engine extends ManagerBase {
if (errorMessage.contains("Maximum number of resources of type 'volume' for account") && errorMessage.contains("has been exceeded")) {
throw new EC2ServiceException(ClientError.VolumeLimitExceeded, "You have reached the limit on the number of volumes that can be created");
} else if (errorMessage.contains("Maximum number of resources of type 'public_ip' for account") && errorMessage.contains("has been exceeded")) {
- throw new EC2ServiceException(ClientError.AddressLimitExceeded, "You have reached the limit on the number of elastic ip addresses your account can have");
+ throw new EC2ServiceException(ClientError.AddressLimitExceeded,
+ "You have reached the limit on the number of elastic ip addresses your account can have");
} else if (errorMessage.contains("Unable to apply save userdata entry on router")) {
throw new EC2ServiceException(ClientError.InvalidParameterValue, "The value supplied for parameter UserData is invalid");
} else {
@@ -2834,7 +2845,8 @@ public class EC2Engine extends ManagerBase {
} else if (errorMessage.contains("Failed to start the stopped instance")) {
throw new EC2ServiceException(ServerError.InternalError, "Unable to start the instance that was stopped during image creation");
} else if (errorMessage.contains("One or more of instanceIds specified is in stopped state")) {
- throw new EC2ServiceException(ClientError.IncorrectInstanceState, "Unable to reboot. One or more of the specified instances is in an incorrect state 'stopped'");
+ throw new EC2ServiceException(ClientError.IncorrectInstanceState,
+ "Unable to reboot. One or more of the specified instances is in an incorrect state 'stopped'");
} else if (errorMessage.contains("Specified ipAddress doesn't exist")) {
throw new EC2ServiceException(ClientError.InvalidParameterValue, "Specified publicIp doesn't exist");
} else if (errorMessage.contains("Min Count is greater than the number of instances left to allocate")) {
@@ -2852,7 +2864,8 @@ public class EC2Engine extends ManagerBase {
} else if (errorMessage.contains("Instance not found")) {
throw new EC2ServiceException(ClientError.InvalidInstanceID_NotFound, "One or more of the specified instanceId not found");
} else if (errorMessage.contains("Cannot modify, instance should be in stopped state")) {
- throw new EC2ServiceException(ClientError.IncorrectInstanceState, "Unable to modify instance attribute. Specified instance is not in the correct state 'stopped'");
+ throw new EC2ServiceException(ClientError.IncorrectInstanceState,
+ "Unable to modify instance attribute. Specified instance is not in the correct state 'stopped'");
} else {
throw new EC2ServiceException(ServerError.InternalError, "An unexpected error occured");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RegisterImage.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RegisterImage.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RegisterImage.java
index 74154ea..3c35da6 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RegisterImage.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RegisterImage.java
@@ -71,7 +71,8 @@ public class EC2RegisterImage {
public void setArchitecture(String param) {
if (null != param) {
if (!param.contains(":") || param.split(":").length < 4) {
- throw new EC2ServiceException(ClientError.InvalidParameterValue, "Supported format for " + "parameter 'architecture' is format:zonename:ostypename:hypervisor");
+ throw new EC2ServiceException(ClientError.InvalidParameterValue, "Supported format for "
+ + "parameter 'architecture' is format:zonename:ostypename:hypervisor");
}
String parts[] = param.split(":");
format = parts[0];
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RunInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RunInstancesResponse.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RunInstancesResponse.java
index e3e767a..3f65af4 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RunInstancesResponse.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RunInstancesResponse.java
@@ -19,8 +19,6 @@ package com.cloud.bridge.service.core.ec2;
import java.util.ArrayList;
import java.util.List;
-import com.cloud.bridge.service.core.ec2.EC2Instance;
-
public class EC2RunInstancesResponse {
private List<EC2Instance> instanceSet = new ArrayList<EC2Instance>();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2SnapshotFilterSet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2SnapshotFilterSet.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2SnapshotFilterSet.java
index 03383f1..d44eea7 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2SnapshotFilterSet.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2SnapshotFilterSet.java
@@ -28,7 +28,6 @@ import java.util.TimeZone;
import com.cloud.bridge.service.UserContext;
import com.cloud.bridge.service.exception.EC2ServiceException;
import com.cloud.bridge.service.exception.EC2ServiceException.ClientError;
-import com.cloud.bridge.util.DateHelper;
import com.cloud.bridge.util.EC2RestAuth;
public class EC2SnapshotFilterSet {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2VolumeFilterSet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2VolumeFilterSet.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2VolumeFilterSet.java
index 91aff0a..40f8e11 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2VolumeFilterSet.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2VolumeFilterSet.java
@@ -19,11 +19,11 @@ package com.cloud.bridge.service.core.ec2;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
-import java.util.Date;
import com.cloud.bridge.service.exception.EC2ServiceException;
import com.cloud.bridge.service.exception.EC2ServiceException.ClientError;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java
index 1af86ae..2dc7eaa 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java
@@ -85,7 +85,6 @@ import com.cloud.bridge.util.PolicyParser;
import com.cloud.bridge.util.StringHelper;
import com.cloud.bridge.util.Triple;
import com.cloud.utils.db.DB;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
/**
@@ -222,8 +221,8 @@ public class S3Engine {
throw new ObjectAlreadyExistsException("Bucket already exists");
shost_storagelocation_pair = allocBucketStorageHost(request.getBucketName(), null);
- SBucketVO sbucket = new SBucketVO(request.getBucketName(), DateHelper.currentGMTTime(), UserContext.current().getCanonicalUserId(),
- shost_storagelocation_pair.getFirst());
+ SBucketVO sbucket =
+ new SBucketVO(request.getBucketName(), DateHelper.currentGMTTime(), UserContext.current().getCanonicalUserId(), shost_storagelocation_pair.getFirst());
shost_storagelocation_pair.getFirst().getBuckets().add(sbucket);
// bucketDao.save(sbucket);
@@ -642,8 +641,8 @@ public class S3Engine {
* We are required to keep the connection alive by returning whitespace characters back periodically.
*/
- public S3PutObjectInlineResponse
- concatentateMultipartUploads(HttpServletResponse httpResp, S3PutObjectInlineRequest request, S3MultipartPart[] parts, OutputStream outputStream) throws IOException {
+ public S3PutObjectInlineResponse concatentateMultipartUploads(HttpServletResponse httpResp, S3PutObjectInlineRequest request, S3MultipartPart[] parts,
+ OutputStream outputStream) throws IOException {
// [A] Set up and initial error checking
S3PutObjectInlineResponse response = new S3PutObjectInlineResponse();
String bucketName = request.getBucketName();
@@ -680,8 +679,9 @@ public class S3Engine {
// explicit transaction control to avoid holding transaction during
// long file concatenation process
txn.start();
- OrderedPair<String, Long> result = bucketAdapter.concatentateObjects(host_storagelocation_pair.getSecond(), bucket.getName(), itemFileName,
- ServiceProvider.getInstance().getMultipartDir(), parts, outputStream);
+ OrderedPair<String, Long> result =
+ bucketAdapter.concatentateObjects(host_storagelocation_pair.getSecond(), bucket.getName(), itemFileName, ServiceProvider.getInstance().getMultipartDir(),
+ parts, outputStream);
response.setETag(result.getFirst());
response.setLastModified(DateHelper.toCalendar(object_objectitem_pair.getSecond().getLastModifiedTime()));
@@ -1237,8 +1237,8 @@ public class S3Engine {
*
* TODO - how does the versionIdMarker work when there is a deletion marker in the object?
*/
- private S3ListBucketObjectEntry[]
- composeListBucketContentEntries(List<SObjectVO> l, String prefix, String delimiter, int maxKeys, boolean enableVersion, String versionIdMarker) {
+ private S3ListBucketObjectEntry[] composeListBucketContentEntries(List<SObjectVO> l, String prefix, String delimiter, int maxKeys, boolean enableVersion,
+ String versionIdMarker) {
List<S3ListBucketObjectEntry> entries = new ArrayList<S3ListBucketObjectEntry>();
SObjectItemVO latest = null;
boolean hitIdMarker = false;
@@ -1425,7 +1425,8 @@ public class S3Engine {
* @throws IOException
*/
@SuppressWarnings("deprecation")
- public OrderedPair<SObjectVO, SObjectItemVO> allocObjectItem(SBucketVO bucket, String nameKey, S3MetaDataEntry[] meta, S3AccessControlList acl, String cannedAccessPolicy) {
+ public OrderedPair<SObjectVO, SObjectItemVO> allocObjectItem(SBucketVO bucket, String nameKey, S3MetaDataEntry[] meta, S3AccessControlList acl,
+ String cannedAccessPolicy) {
SObjectItemVO item = null;
int versionSeq = 1;
int versioningStatus = bucket.getVersioningStatus();
@@ -1684,7 +1685,8 @@ public class S3Engine {
* @return S3BucketPolicy
* @throws SQLException, ClassNotFoundException, IllegalAccessException, InstantiationException, ParseException
*/
- public static S3BucketPolicy loadPolicy(S3PolicyContext context) throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException, ParseException {
+ public static S3BucketPolicy loadPolicy(S3PolicyContext context) throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException,
+ ParseException {
OrderedPair<S3BucketPolicy, Integer> result = ServiceProvider.getInstance().getBucketPolicy(context.getBucketName());
S3BucketPolicy policy = result.getFirst();
if (null == policy) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/core/s3/S3Grant.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3Grant.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3Grant.java
index 16adbde..d0db198 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3Grant.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3Grant.java
@@ -18,10 +18,7 @@ package com.cloud.bridge.service.core.s3;
import java.util.List;
-import com.cloud.bridge.model.SAcl;
import com.cloud.bridge.model.SAclVO;
-import com.cloud.bridge.model.SBucket;
-import com.cloud.bridge.service.exception.UnsupportedException;
/**
* Each relation holds
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsEntry.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsEntry.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsEntry.java
index 85c412e..ea4d7a1 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsEntry.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsEntry.java
@@ -17,7 +17,6 @@
package com.cloud.bridge.service.core.s3;
import java.util.Calendar;
-import java.util.TimeZone;
public class S3ListAllMyBucketsEntry {
private String name;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyArnCondition.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyArnCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyArnCondition.java
index 01d14be..d56ac01 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyArnCondition.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyArnCondition.java
@@ -110,7 +110,7 @@ public class S3PolicyArnCondition extends S3PolicyCondition {
return false;
}
logger.info("S3PolicyArnCondition eval - SID: " + SID + ", " + condition + ", key: " + keyName + ", valuePassedIn: " + toCompareWith + ", valueInRule: " +
- valueList[i] + ", result: " + keyResult);
+ valueList[i] + ", result: " + keyResult);
}
// -> if all key values are false, false then that key is false and then the entire condition is then false
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyCondition.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyCondition.java
index 7e432e9..55bfee1 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyCondition.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyCondition.java
@@ -28,7 +28,22 @@ import com.cloud.bridge.service.exception.PermissionDeniedException;
public abstract class S3PolicyCondition {
public enum ConditionKeys {
- UnknownKey, CurrentTime, SecureTransport, SourceIp, SourceArn, UserAgent, EpochTime, Referer, Acl, Location, Prefix, Delimiter, MaxKeys, CopySource, MetaData, VersionId
+ UnknownKey,
+ CurrentTime,
+ SecureTransport,
+ SourceIp,
+ SourceArn,
+ UserAgent,
+ EpochTime,
+ Referer,
+ Acl,
+ Location,
+ Prefix,
+ Delimiter,
+ MaxKeys,
+ CopySource,
+ MetaData,
+ VersionId
}
protected PolicyConditions condition = null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyDateCondition.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyDateCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyDateCondition.java
index 70ed117..d3b182d 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyDateCondition.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyDateCondition.java
@@ -134,8 +134,8 @@ public class S3PolicyDateCondition extends S3PolicyCondition {
default:
return false;
}
- logger.info("S3PolicyDateCondition eval - SID: " + SID + ", " + condition + ", key: " + keyName + ", valuePassedIn: " + DatatypeConverter.printDateTime(tod) +
- ", valueInRule: " + DatatypeConverter.printDateTime(valueList[i]) + ", result: " + keyResult);
+ logger.info("S3PolicyDateCondition eval - SID: " + SID + ", " + condition + ", key: " + keyName + ", valuePassedIn: " +
+ DatatypeConverter.printDateTime(tod) + ", valueInRule: " + DatatypeConverter.printDateTime(valueList[i]) + ", result: " + keyResult);
}
// -> if all key values are, false then that key is false and then the entire condition is then false
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyIPAddressCondition.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyIPAddressCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyIPAddressCondition.java
index a0d667f..409708a 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyIPAddressCondition.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyIPAddressCondition.java
@@ -104,7 +104,7 @@ public class S3PolicyIPAddressCondition extends S3PolicyCondition {
return false;
}
logger.info("S3PolicyIPAddressCondition eval - SID: " + SID + ", " + condition + ", key: " + keyName + ", valuePassedIn: " + toCompareWith.toString() +
- ", valueInRule: " + valueList[i].toString() + ", result: " + keyResult);
+ ", valueInRule: " + valueList[i].toString() + ", result: " + keyResult);
}
// -> if all key values are false, false then that key is false and then the entire condition is then false
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyNumericCondition.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyNumericCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyNumericCondition.java
index a1f741c..8790d7c 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyNumericCondition.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyNumericCondition.java
@@ -123,8 +123,8 @@ public class S3PolicyNumericCondition extends S3PolicyCondition {
default:
return false;
}
- logger.info("S3PolicyNumericCondition eval - SID: " + SID + ", " + condition + ", key: " + keyName + ", valuePassedIn: " + toCompareWith + ", valueInRule: " +
- valueList[i] + ", result: " + keyResult);
+ logger.info("S3PolicyNumericCondition eval - SID: " + SID + ", " + condition + ", key: " + keyName + ", valuePassedIn: " + toCompareWith +
+ ", valueInRule: " + valueList[i] + ", result: " + keyResult);
}
// -> if all key values are, false then that key is false and then the entire condition is then false
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStringCondition.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStringCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStringCondition.java
index 78eb082..4f56d3e 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStringCondition.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStringCondition.java
@@ -120,8 +120,8 @@ public class S3PolicyStringCondition extends S3PolicyCondition {
default:
return false;
}
- logger.info("S3PolicyStringCondition eval - SID: " + SID + ", " + condition + ", key: " + keyName + ", valuePassedIn: " + toCompareWith + ", valueInRule: " +
- valueList[i] + ", result: " + keyResult);
+ logger.info("S3PolicyStringCondition eval - SID: " + SID + ", " + condition + ", key: " + keyName + ", valuePassedIn: " + toCompareWith +
+ ", valueInRule: " + valueList[i] + ", result: " + keyResult);
}
// -> if all key values are false, false then that key is false and then the entire condition is then false
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/tool/CloudS3CmdTool.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/tool/CloudS3CmdTool.java b/awsapi/src/com/cloud/bridge/tool/CloudS3CmdTool.java
index 4c88e73..190b7a7 100644
--- a/awsapi/src/com/cloud/bridge/tool/CloudS3CmdTool.java
+++ b/awsapi/src/com/cloud/bridge/tool/CloudS3CmdTool.java
@@ -222,7 +222,7 @@ public class CloudS3CmdTool {
ListBucketResult result = response.getListBucketResponse();
System.out.println("\tContent of Bucket " + result.getName());
System.out.println("\tListing with prefix: " + result.getPrefix() + ", delimiter: " + result.getDelimiter() + ", marker: " + result.getMarker() + ", max: " +
- result.getMaxKeys());
+ result.getMaxKeys());
ListEntry[] entries = result.getContents();
if (entries != null) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/util/AuthenticationUtils.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/AuthenticationUtils.java b/awsapi/src/com/cloud/bridge/util/AuthenticationUtils.java
index 4486769..bc5dcbf 100644
--- a/awsapi/src/com/cloud/bridge/util/AuthenticationUtils.java
+++ b/awsapi/src/com/cloud/bridge/util/AuthenticationUtils.java
@@ -16,12 +16,13 @@
// under the License.
package com.cloud.bridge.util;
-import org.apache.log4j.Logger;
-
+import java.math.BigInteger;
import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
+
import javax.security.auth.x500.X500Principal;
-import java.math.BigInteger;
+
+import org.apache.log4j.Logger;
public class AuthenticationUtils {
protected final static Logger logger = Logger.getLogger(AuthenticationUtils.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java b/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java
index 932870a..e5f3820 100644
--- a/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java
+++ b/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java
@@ -17,13 +17,12 @@
package com.cloud.bridge.util;
-import java.text.SimpleDateFormat;
-
import java.text.DateFormat;
import java.text.FieldPosition;
import java.text.ParsePosition;
-import java.util.Date;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
+import java.util.Date;
import java.util.TimeZone;
/**
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/util/IpAddressRange.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/IpAddressRange.java b/awsapi/src/com/cloud/bridge/util/IpAddressRange.java
index 9757eb0..785c032 100644
--- a/awsapi/src/com/cloud/bridge/util/IpAddressRange.java
+++ b/awsapi/src/com/cloud/bridge/util/IpAddressRange.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.bridge.util;
-import java.io.IOException;
-
/**
* Represents a network IP address or a range of addresses.
* A range is useful when representing IP addresses defined in
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/util/JsonAccessor.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/JsonAccessor.java b/awsapi/src/com/cloud/bridge/util/JsonAccessor.java
index 7fbb2fe..2a94dea 100644
--- a/awsapi/src/com/cloud/bridge/util/JsonAccessor.java
+++ b/awsapi/src/com/cloud/bridge/util/JsonAccessor.java
@@ -22,12 +22,13 @@ import java.util.ArrayList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import com.cloud.bridge.service.exception.InternalErrorException;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
+import com.cloud.bridge.service.exception.InternalErrorException;
+
/**
* JsonAccessor provides the functionality to allow navigating JSON object graph using simple expressions,
* for example, following property access expressions are all valid ones
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/util/PolicyParser.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/PolicyParser.java b/awsapi/src/com/cloud/bridge/util/PolicyParser.java
index 9bcbdbc..a19bc96 100644
--- a/awsapi/src/com/cloud/bridge/util/PolicyParser.java
+++ b/awsapi/src/com/cloud/bridge/util/PolicyParser.java
@@ -25,15 +25,15 @@ import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import com.cloud.bridge.service.core.s3.S3BucketPolicy;
+import com.cloud.bridge.service.core.s3.S3BucketPolicy.PolicyAccess;
import com.cloud.bridge.service.core.s3.S3ConditionFactory;
import com.cloud.bridge.service.core.s3.S3PolicyAction;
+import com.cloud.bridge.service.core.s3.S3PolicyAction.PolicyActions;
import com.cloud.bridge.service.core.s3.S3PolicyCondition;
+import com.cloud.bridge.service.core.s3.S3PolicyCondition.ConditionKeys;
import com.cloud.bridge.service.core.s3.S3PolicyConditionBlock;
import com.cloud.bridge.service.core.s3.S3PolicyPrincipal;
import com.cloud.bridge.service.core.s3.S3PolicyStatement;
-import com.cloud.bridge.service.core.s3.S3BucketPolicy.PolicyAccess;
-import com.cloud.bridge.service.core.s3.S3PolicyAction.PolicyActions;
-import com.cloud.bridge.service.core.s3.S3PolicyCondition.ConditionKeys;
import com.cloud.bridge.service.exception.PermissionDeniedException;
/**
@@ -345,8 +345,8 @@ public class PolicyParser {
testBucketName = testBucketName.substring(0, offset);
if (!testBucketName.equals(bucketName))
- throw new PermissionDeniedException("The S3 Bucket Policy must only refer to the single bucket: \"" + bucketName + "\", but it referres to the following resource: \"" +
- resourcePath + "\"");
+ throw new PermissionDeniedException("The S3 Bucket Policy must only refer to the single bucket: \"" + bucketName +
+ "\", but it referres to the following resource: \"" + resourcePath + "\"");
}
public static void badPolicy(String place, String badValue) throws ParseException {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/util/RestAuth.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/RestAuth.java b/awsapi/src/com/cloud/bridge/util/RestAuth.java
index 613ee41..c370c4a 100644
--- a/awsapi/src/com/cloud/bridge/util/RestAuth.java
+++ b/awsapi/src/com/cloud/bridge/util/RestAuth.java
@@ -16,11 +16,16 @@
// under the License.
package com.cloud.bridge.util;
-import java.security.InvalidKeyException;
-import java.security.SignatureException;
-import java.util.*;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
+import java.security.InvalidKeyException;
+import java.security.SignatureException;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/util/XSerializerJsonAdapter.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/XSerializerJsonAdapter.java b/awsapi/src/com/cloud/bridge/util/XSerializerJsonAdapter.java
index cc59a34..27d8d53 100644
--- a/awsapi/src/com/cloud/bridge/util/XSerializerJsonAdapter.java
+++ b/awsapi/src/com/cloud/bridge/util/XSerializerJsonAdapter.java
@@ -57,7 +57,8 @@ public class XSerializerJsonAdapter implements XSerializerAdapter {
if (value != null) {
indent(true, indentLevel, writer);
writer.print(elementName + ":\"");
- writer.print(DateHelper.getGMTDateFormat("yyyy-MM-dd").format((Date)value) + "T" + DateHelper.getGMTDateFormat("HH:mm:ss").format((Date)value) + ".000Z");
+ writer.print(DateHelper.getGMTDateFormat("yyyy-MM-dd").format((Date)value) + "T" + DateHelper.getGMTDateFormat("HH:mm:ss").format((Date)value) +
+ ".000Z");
writer.print("\"");
} else {
if (!serializer.omitNullField(f)) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/util/XSerializerXmlAdapter.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/XSerializerXmlAdapter.java b/awsapi/src/com/cloud/bridge/util/XSerializerXmlAdapter.java
index 248b059..c21d3b3 100644
--- a/awsapi/src/com/cloud/bridge/util/XSerializerXmlAdapter.java
+++ b/awsapi/src/com/cloud/bridge/util/XSerializerXmlAdapter.java
@@ -61,7 +61,8 @@ public class XSerializerXmlAdapter implements XSerializerAdapter {
if (value != null) {
indent(true, indentLevel, writer);
writer.print("<" + elementName + ">");
- writer.print(DateHelper.getGMTDateFormat("yyyy-MM-dd").format((Date)value) + "T" + DateHelper.getGMTDateFormat("HH:mm:ss").format((Date)value) + ".000Z");
+ writer.print(DateHelper.getGMTDateFormat("yyyy-MM-dd").format((Date)value) + "T" + DateHelper.getGMTDateFormat("HH:mm:ss").format((Date)value) +
+ ".000Z");
writer.print("</" + elementName + ">");
} else {
if (!serializer.omitNullField(f)) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/bridge/util/XmlHelper.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/XmlHelper.java b/awsapi/src/com/cloud/bridge/util/XmlHelper.java
index 92cd013..0bcd245 100644
--- a/awsapi/src/com/cloud/bridge/util/XmlHelper.java
+++ b/awsapi/src/com/cloud/bridge/util/XmlHelper.java
@@ -23,14 +23,6 @@ import java.io.InputStream;
import java.io.StringWriter;
import java.util.Properties;
-import org.apache.log4j.Logger;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -42,6 +34,14 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
+import org.apache.log4j.Logger;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
public class XmlHelper {
protected static Logger logger = Logger.getLogger(XmlHelper.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/stack/CloudStackApi.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/CloudStackApi.java b/awsapi/src/com/cloud/stack/CloudStackApi.java
index ab6cb91..b7a1210 100644
--- a/awsapi/src/com/cloud/stack/CloudStackApi.java
+++ b/awsapi/src/com/cloud/stack/CloudStackApi.java
@@ -21,6 +21,8 @@ import java.util.List;
import org.apache.log4j.Logger;
+import com.google.gson.reflect.TypeToken;
+
import com.cloud.stack.models.ApiConstants;
import com.cloud.stack.models.CloudStackAccount;
import com.cloud.stack.models.CloudStackCapabilities;
@@ -44,7 +46,6 @@ import com.cloud.stack.models.CloudStackPortForwardingRule;
import com.cloud.stack.models.CloudStackResourceLimit;
import com.cloud.stack.models.CloudStackResourceTag;
import com.cloud.stack.models.CloudStackSecurityGroup;
-import com.cloud.stack.models.CloudStackSecurityGroupIngress;
import com.cloud.stack.models.CloudStackServiceOffering;
import com.cloud.stack.models.CloudStackSnapshot;
import com.cloud.stack.models.CloudStackSnapshotPolicy;
@@ -53,7 +54,6 @@ import com.cloud.stack.models.CloudStackTemplatePermission;
import com.cloud.stack.models.CloudStackUserVm;
import com.cloud.stack.models.CloudStackVolume;
import com.cloud.stack.models.CloudStackZone;
-import com.google.gson.reflect.TypeToken;
/**
* The goal here is to wrap the actual CloudStack API calls...
@@ -139,8 +139,8 @@ public class CloudStackApi {
* @throws Exception
*/
public CloudStackUserVm deployVirtualMachine(String serviceOfferingId, String templateId, String zoneId, String account, String diskOfferingId, String displayName,
- String domainId, String group, String hostId, String hypervisor, String keyPair, String name, String networkId, String securityGroupIds, String securityGroupNames,
- Long size, String userData) throws Exception {
+ String domainId, String group, String hostId, String hypervisor, String keyPair, String name, String networkId, String securityGroupIds,
+ String securityGroupNames, Long size, String userData) throws Exception {
CloudStackCommand cmd = new CloudStackCommand(ApiConstants.DEPLOY_VIRTUAL_MACHINE);
if (cmd != null) {
// these are required
@@ -368,8 +368,9 @@ public class CloudStackApi {
if (resourceTags != null && resourceTags.size() > 0)
cmd = setParams(cmd, null, null, resourceTags);
}
- return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_VIRTUAL_MACHINES_RESPONSE, ApiConstants.VIRTUAL_MACHINE, new TypeToken<List<CloudStackUserVm>>() {
- }.getType());
+ return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_VIRTUAL_MACHINES_RESPONSE, ApiConstants.VIRTUAL_MACHINE,
+ new TypeToken<List<CloudStackUserVm>>() {
+ }.getType());
}
/**
@@ -405,8 +406,8 @@ public class CloudStackApi {
* @return
* @throws Exception
*/
- public CloudStackTemplate createTemplate(String displayText, String name, String osTypeId, String bits, Boolean isFeatured, Boolean isPublic, Boolean passwordEnabled,
- Boolean requiresHVM, String snapshotId, String volumeId) throws Exception {
+ public CloudStackTemplate createTemplate(String displayText, String name, String osTypeId, String bits, Boolean isFeatured, Boolean isPublic,
+ Boolean passwordEnabled, Boolean requiresHVM, String snapshotId, String volumeId) throws Exception {
CloudStackCommand cmd = new CloudStackCommand(ApiConstants.CREATE_TEMPLATE);
if (cmd != null) {
cmd.setParam(ApiConstants.DISPLAY_TEXT, displayText);
@@ -452,8 +453,9 @@ public class CloudStackApi {
* @return
* @throws Exception
*/
- public List<CloudStackTemplate> registerTemplate(String displayText, String format, String hypervisor, String name, String osTypeId, String url, String zoneId, String account,
- String bits, String checksum, String domainId, Boolean isExtractable, Boolean isFeatured, Boolean isPublic, Boolean passwordEnabled, Boolean requiresHVM) throws Exception {
+ public List<CloudStackTemplate> registerTemplate(String displayText, String format, String hypervisor, String name, String osTypeId, String url, String zoneId,
+ String account, String bits, String checksum, String domainId, Boolean isExtractable, Boolean isFeatured, Boolean isPublic, Boolean passwordEnabled,
+ Boolean requiresHVM) throws Exception {
CloudStackCommand cmd = new CloudStackCommand(ApiConstants.REGISTER_TEMPLATE);
if (cmd != null) {
cmd.setParam(ApiConstants.DISPLAY_TEXT, displayText);
@@ -571,8 +573,8 @@ public class CloudStackApi {
* @return
* @throws Exception
*/
- public List<CloudStackTemplate> listTemplates(String templateFilter, String account, String domainId, String hypervisor, String id, String keyWord, String name, String zoneId)
- throws Exception {
+ public List<CloudStackTemplate> listTemplates(String templateFilter, String account, String domainId, String hypervisor, String id, String keyWord, String name,
+ String zoneId) throws Exception {
CloudStackCommand cmd = new CloudStackCommand(ApiConstants.LIST_TEMPLATES);
if (cmd != null) {
cmd.setParam(ApiConstants.TEMPLATE_FILTER, templateFilter);
@@ -609,7 +611,8 @@ public class CloudStackApi {
* @return
* @throws Exception
*/
- public CloudStackInfoResponse updateTemplatePermissions(String id, String accounts, Boolean isExtractable, Boolean isFeatured, Boolean isPublic, String op) throws Exception {
+ public CloudStackInfoResponse updateTemplatePermissions(String id, String accounts, Boolean isExtractable, Boolean isFeatured, Boolean isPublic, String op)
+ throws Exception {
CloudStackCommand cmd = new CloudStackCommand(ApiConstants.UPDATE_TEMPLATE_PERMISSIONS);
if (cmd != null) {
cmd.setParam(ApiConstants.ID, id);
@@ -645,7 +648,8 @@ public class CloudStackApi {
if (domainId != null)
cmd.setParam(ApiConstants.DOMAIN_ID, domainId);
}
- return _client.call(cmd, apiKey, secretKey, false, ApiConstants.LIST_TEMPLATE_PERMISSIONS_RESPONSE, ApiConstants.TEMPLATE_PERMISSION, CloudStackTemplatePermission.class);
+ return _client.call(cmd, apiKey, secretKey, false, ApiConstants.LIST_TEMPLATE_PERMISSIONS_RESPONSE, ApiConstants.TEMPLATE_PERMISSION,
+ CloudStackTemplatePermission.class);
}
/**
@@ -720,8 +724,8 @@ public class CloudStackApi {
* @return
* @throws Exception
*/
- public List<CloudStackTemplate> listIsos(String account, Boolean bootable, String domainId, String hypervisor, String id, String isoFilter, Boolean isPublic, Boolean isReady,
- String keyWord, String name, String zoneId) throws Exception {
+ public List<CloudStackTemplate> listIsos(String account, Boolean bootable, String domainId, String hypervisor, String id, String isoFilter, Boolean isPublic,
+ Boolean isReady, String keyWord, String name, String zoneId) throws Exception {
CloudStackCommand cmd = new CloudStackCommand(ApiConstants.LIST_ISOS);
if (cmd != null) {
if (account != null)
@@ -768,8 +772,8 @@ public class CloudStackApi {
* @return
* @throws Exception
*/
- public CloudStackTemplate registerIso(String displayText, String name, String url, String zoneId, String account, Boolean bootable, String domainId, Boolean isExtractable,
- Boolean isFeatured, Boolean isPublic, String osTypeId) throws Exception {
+ public CloudStackTemplate registerIso(String displayText, String name, String url, String zoneId, String account, Boolean bootable, String domainId,
+ Boolean isExtractable, Boolean isFeatured, Boolean isPublic, String osTypeId) throws Exception {
CloudStackCommand cmd = new CloudStackCommand(ApiConstants.REGISTER_ISO);
if (cmd != null) {
cmd.setParam(ApiConstants.DISPLAY_TEXT, displayText);
@@ -807,7 +811,8 @@ public class CloudStackApi {
* @return
* @throws Exception
*/
- public CloudStackTemplate updateIso(String id, Boolean bootable, String displayText, String format, String name, String osTypeId, Boolean passwordEnabled) throws Exception {
+ public CloudStackTemplate updateIso(String id, Boolean bootable, String displayText, String format, String name, String osTypeId, Boolean passwordEnabled)
+ throws Exception {
CloudStackCommand cmd = new CloudStackCommand(ApiConstants.UPDATE_ISO);
if (cmd != null) {
cmd.setParam(ApiConstants.ID, id);
@@ -875,7 +880,8 @@ public class CloudStackApi {
* @return
* @throws Exception
*/
- public CloudStackInfoResponse updateIsoPermissions(String id, String accounts, Boolean isExtractable, Boolean isFeatured, Boolean isPublic, String op) throws Exception {
+ public CloudStackInfoResponse updateIsoPermissions(String id, String accounts, Boolean isExtractable, Boolean isFeatured, Boolean isPublic, String op)
+ throws Exception {
CloudStackCommand cmd = new CloudStackCommand(ApiConstants.UPDATE_ISO_PERMISSIONS);
if (cmd != null) {
cmd.setParam(ApiConstants.ID, id);
@@ -910,8 +916,9 @@ public class CloudStackApi {
if (domainId != null)
cmd.setParam(ApiConstants.DOMAIN_ID, domainId);
}
- return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_ISO_PERMISSIONS_RESPONSE, ApiConstants.TEMPLATE, new TypeToken<List<CloudStackTemplatePermission>>() {
- }.getType());
+ return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_ISO_PERMISSIONS_RESPONSE, ApiConstants.TEMPLATE,
+ new TypeToken<List<CloudStackTemplatePermission>>() {
+ }.getType());
}
/**
@@ -992,7 +999,8 @@ public class CloudStackApi {
* @return
* @throws Exception
*/
- public CloudStackVolume createVolume(String name, String account, String diskOfferingId, String domainId, Long size, String snapshotId, String zoneId) throws Exception {
+ public CloudStackVolume createVolume(String name, String account, String diskOfferingId, String domainId, Long size, String snapshotId, String zoneId)
+ throws Exception {
CloudStackCommand cmd = new CloudStackCommand(ApiConstants.CREATE_VOLUME);
if (cmd != null) {
cmd.setParam(ApiConstants.NAME, name);
@@ -1240,8 +1248,8 @@ public class CloudStackApi {
* @return
* @throws Exception
*/
- public CloudStackSecurityGroup authorizeSecurityGroupIngress(String account, String cidrList, String domainId, Long endPort, String icmpCode, String icmpType, String protocol,
- String securityGroupId, String securityGroupName, Long startPort, List<CloudStackKeyValue> userSecurityGroupList) throws Exception {
+ public CloudStackSecurityGroup authorizeSecurityGroupIngress(String account, String cidrList, String domainId, Long endPort, String icmpCode, String icmpType,
+ String protocol, String securityGroupId, String securityGroupName, Long startPort, List<CloudStackKeyValue> userSecurityGroupList) throws Exception {
CloudStackCommand cmd = new CloudStackCommand(ApiConstants.AUTHORIZE_SECURITY_GROUP_INGRESS);
if (cmd != null) {
if (account != null)
@@ -1273,7 +1281,8 @@ public class CloudStackApi {
}
}
}
- return _client.call(cmd, apiKey, secretKey, true, ApiConstants.AUTHORIZE_SECURITY_GROUP_INGRESS_RESPONSE, ApiConstants.SECURITY_GROUP, CloudStackSecurityGroup.class);
+ return _client.call(cmd, apiKey, secretKey, true, ApiConstants.AUTHORIZE_SECURITY_GROUP_INGRESS_RESPONSE, ApiConstants.SECURITY_GROUP,
+ CloudStackSecurityGroup.class);
}
/**
@@ -1321,8 +1330,9 @@ public class CloudStackApi {
if (virtualMachineId != null)
cmd.setParam(ApiConstants.VIRTUAL_MACHINE_ID, virtualMachineId);
}
- return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_SECURITY_GROUPS_RESPONSE, ApiConstants.SECURITY_GROUP, new TypeToken<List<CloudStackSecurityGroup>>() {
- }.getType());
+ return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_SECURITY_GROUPS_RESPONSE, ApiConstants.SECURITY_GROUP,
+ new TypeToken<List<CloudStackSecurityGroup>>() {
+ }.getType());
}
// Accounts
@@ -1340,8 +1350,8 @@ public class CloudStackApi {
* @return
* @throws Exception
*/
- public List<CloudStackAccount> listAccounts(Long accountType, String domainId, String id, Boolean isCleanupRequired, Boolean isRecursive, String keyWord, String name,
- String state) throws Exception {
+ public List<CloudStackAccount> listAccounts(Long accountType, String domainId, String id, Boolean isCleanupRequired, Boolean isRecursive, String keyWord,
+ String name, String state) throws Exception {
CloudStackCommand cmd = new CloudStackCommand(ApiConstants.LIST_ACCOUNTS);
if (cmd != null) {
if (accountType != null)
@@ -1506,8 +1516,9 @@ public class CloudStackApi {
if (keyWord != null)
cmd.setParam(ApiConstants.KEYWORD, keyWord);
}
- return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_SNAPSHOT_POLICIES_RESPONSE, ApiConstants.SNAPSHOT, new TypeToken<List<CloudStackSnapshotPolicy>>() {
- }.getType());
+ return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_SNAPSHOT_POLICIES_RESPONSE, ApiConstants.SNAPSHOT,
+ new TypeToken<List<CloudStackSnapshotPolicy>>() {
+ }.getType());
}
// Events
@@ -1673,8 +1684,9 @@ public class CloudStackApi {
if (name != null)
cmd.setParam(ApiConstants.NAME, name);
}
- return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_DISK_OFFERINGS_RESPONSE, ApiConstants.DISK_OFFERING, new TypeToken<List<CloudStackDiskOffering>>() {
- }.getType());
+ return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_DISK_OFFERINGS_RESPONSE, ApiConstants.DISK_OFFERING,
+ new TypeToken<List<CloudStackDiskOffering>>() {
+ }.getType());
}
// SSH keys
@@ -1811,8 +1823,8 @@ public class CloudStackApi {
* @param id
* @return
*/
- public List<CloudStackIpAddress> listPublicIpAddresses(String account, Boolean allocatedOnly, String domainId, Boolean forVirtualNetwork, String id, String ipAddress,
- String keyWord, String vlanId, String zoneId) throws Exception {
+ public List<CloudStackIpAddress> listPublicIpAddresses(String account, Boolean allocatedOnly, String domainId, Boolean forVirtualNetwork, String id,
+ String ipAddress, String keyWord, String vlanId, String zoneId) throws Exception {
CloudStackCommand cmd = new CloudStackCommand(ApiConstants.LIST_PUBLIC_IP_ADDRESSES);
if (cmd != null) {
if (account != null)
@@ -1834,8 +1846,9 @@ public class CloudStackApi {
if (zoneId != null)
cmd.setParam(ApiConstants.ZONE_ID, zoneId);
}
- return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_PUBLIC_IP_ADDRESSES_RESPONSE, ApiConstants.PUBLIC_IP_ADDRESS, new TypeToken<List<CloudStackIpAddress>>() {
- }.getType());
+ return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_PUBLIC_IP_ADDRESSES_RESPONSE, ApiConstants.PUBLIC_IP_ADDRESS,
+ new TypeToken<List<CloudStackIpAddress>>() {
+ }.getType());
}
// Firewall
@@ -1883,8 +1896,8 @@ public class CloudStackApi {
* @return
* @throws Exception
*/
- public CloudStackPortForwardingRule createPortForwardingRule(String ipAddressId, Long privatePort, String protocol, Long publicPort, String virtualMachineId, String cidrList,
- Long privateEndPort, Long publicEndPort) throws Exception {
+ public CloudStackPortForwardingRule createPortForwardingRule(String ipAddressId, Long privatePort, String protocol, Long publicPort, String virtualMachineId,
+ String cidrList, Long privateEndPort, Long publicEndPort) throws Exception {
CloudStackCommand cmd = new CloudStackCommand(ApiConstants.CREATE_PORT_FORWARDING_RULE);
if (cmd != null) {
cmd.setParam(ApiConstants.IP_ADDRESS_ID, ipAddressId);
@@ -1899,7 +1912,8 @@ public class CloudStackApi {
if (publicEndPort != null)
cmd.setParam(ApiConstants.PUBLIC_END_PORT, publicEndPort.toString());
}
- return _client.call(cmd, apiKey, secretKey, true, ApiConstants.CREATE_PORT_FORWARDING_RULE_RESPONSE, ApiConstants.PORT_FORWARDING_RULE, CloudStackPortForwardingRule.class);
+ return _client.call(cmd, apiKey, secretKey, true, ApiConstants.CREATE_PORT_FORWARDING_RULE_RESPONSE, ApiConstants.PORT_FORWARDING_RULE,
+ CloudStackPortForwardingRule.class);
}
/**
@@ -1953,7 +1967,8 @@ public class CloudStackApi {
if (endPort != null)
cmd.setParam(ApiConstants.END_PORT, endPort.toString());
}
- return _client.call(cmd, apiKey, secretKey, true, ApiConstants.CREATE_IP_FORWARDING_RULE_RESPONSE, ApiConstants.IP_FORWARDING_RULE, CloudStackPortForwardingRule.class);
+ return _client.call(cmd, apiKey, secretKey, true, ApiConstants.CREATE_IP_FORWARDING_RULE_RESPONSE, ApiConstants.IP_FORWARDING_RULE,
+ CloudStackPortForwardingRule.class);
}
/**
@@ -1983,8 +1998,8 @@ public class CloudStackApi {
* @return
* @throws Exception
*/
- public List<CloudStackPortForwardingRule> listIpForwardingRules(String account, String domainId, String id, String ipAddressId, String keyWord, String virtualMachineId)
- throws Exception {
+ public List<CloudStackPortForwardingRule> listIpForwardingRules(String account, String domainId, String id, String ipAddressId, String keyWord,
+ String virtualMachineId) throws Exception {
CloudStackCommand cmd = new CloudStackCommand(ApiConstants.LIST_IP_FORWARDING_RULES);
if (cmd != null) {
if (account != null)
@@ -2265,8 +2280,9 @@ public class CloudStackApi {
if (name != null)
cmd.setParam(ApiConstants.NAME, name);
}
- return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_INSTANCE_GROUPS_RESPONSE, ApiConstants.INSTANCE_GROUP, new TypeToken<List<CloudStackInstanceGroup>>() {
- }.getType());
+ return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_INSTANCE_GROUPS_RESPONSE, ApiConstants.INSTANCE_GROUP,
+ new TypeToken<List<CloudStackInstanceGroup>>() {
+ }.getType());
}
@@ -2492,8 +2508,8 @@ public class CloudStackApi {
* @return
* @throws Exception
*/
- public List<CloudStackNetworkOffering> listNetworkOfferings(String availability, String displayText, String guestIpType, String id, Boolean isDefault, Boolean isShared,
- String keyWord, String name, String specifyVLan, String trafficType, String zoneId) throws Exception {
+ public List<CloudStackNetworkOffering> listNetworkOfferings(String availability, String displayText, String guestIpType, String id, Boolean isDefault,
+ Boolean isShared, String keyWord, String name, String specifyVLan, String trafficType, String zoneId) throws Exception {
CloudStackCommand cmd = new CloudStackCommand(ApiConstants.LIST_NETWORK_OFFERINGS);
if (cmd != null) {
if (availability != null)
@@ -2562,8 +2578,9 @@ public class CloudStackApi {
if (resourceType != null)
cmd.setParam(ApiConstants.RESOURCE_TYPE, resourceType);
}
- return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_RESOURCE_LIMITS_RESPONSE, ApiConstants.RESOURCE_LIMIT, new TypeToken<List<CloudStackResourceLimit>>() {
- }.getType());
+ return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_RESOURCE_LIMITS_RESPONSE, ApiConstants.RESOURCE_LIMIT,
+ new TypeToken<List<CloudStackResourceLimit>>() {
+ }.getType());
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/cloud/stack/CloudStackClient.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/CloudStackClient.java b/awsapi/src/com/cloud/stack/CloudStackClient.java
index c8d63cd..03eba96 100644
--- a/awsapi/src/com/cloud/stack/CloudStackClient.java
+++ b/awsapi/src/com/cloud/stack/CloudStackClient.java
@@ -27,11 +27,12 @@ import java.util.List;
import org.apache.log4j.Logger;
-import com.cloud.bridge.util.JsonAccessor;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
+import com.cloud.bridge.util.JsonAccessor;
+
/**
* CloudStackClient implements a simple CloudStack client object, it can be used to execute CloudStack commands
* with JSON response
@@ -85,8 +86,8 @@ public class CloudStackClient {
return this;
}
- public <T> T call(CloudStackCommand cmd, String apiKey, String secretKey, boolean followToAsyncResult, String responseName, String responseObjName, Class<T> responseClz)
- throws Exception {
+ public <T> T call(CloudStackCommand cmd, String apiKey, String secretKey, boolean followToAsyncResult, String responseName, String responseObjName,
+ Class<T> responseClz) throws Exception {
assert (responseName != null);
@@ -104,7 +105,7 @@ public class CloudStackClient {
switch (jobStatus) {
case 2:
throw new Exception(queryAsyncJobResponse.getAsString("queryasyncjobresultresponse.jobresult.errortext") + " Error Code - " +
- queryAsyncJobResponse.getAsString("queryasyncjobresultresponse.jobresult.errorcode"));
+ queryAsyncJobResponse.getAsString("queryasyncjobresultresponse.jobresult.errorcode"));
case 0:
try {
@@ -138,7 +139,8 @@ public class CloudStackClient {
}
// collectionType example : new TypeToken<List<String>>() {}.getType();
- public <T> List<T> listCall(CloudStackCommand cmd, String apiKey, String secretKey, String responseName, String responseObjName, Type collectionType) throws Exception {
+ public <T> List<T> listCall(CloudStackCommand cmd, String apiKey, String secretKey, String responseName, String responseObjName, Type collectionType)
+ throws Exception {
assert (responseName != null);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/test/com/cloud/gate/service/ServiceTestCase.java
----------------------------------------------------------------------
diff --git a/awsapi/test/com/cloud/gate/service/ServiceTestCase.java b/awsapi/test/com/cloud/gate/service/ServiceTestCase.java
index a939b13..e768365 100644
--- a/awsapi/test/com/cloud/gate/service/ServiceTestCase.java
+++ b/awsapi/test/com/cloud/gate/service/ServiceTestCase.java
@@ -27,6 +27,7 @@ import com.amazon.s3.client.AmazonS3Stub.CreateBucket;
import com.amazon.s3.client.AmazonS3Stub.CreateBucketResponse;
import com.amazon.s3.client.AmazonS3Stub.DeleteBucket;
import com.amazon.s3.client.AmazonS3Stub.DeleteBucketResponse;
+
import com.cloud.gate.testcase.BaseTestCase;
public class ServiceTestCase extends BaseTestCase {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/test/com/cloud/gate/util/CloudStackClientTestCase.java
----------------------------------------------------------------------
diff --git a/awsapi/test/com/cloud/gate/util/CloudStackClientTestCase.java b/awsapi/test/com/cloud/gate/util/CloudStackClientTestCase.java
index 1ed4952..826cb3a 100644
--- a/awsapi/test/com/cloud/gate/util/CloudStackClientTestCase.java
+++ b/awsapi/test/com/cloud/gate/util/CloudStackClientTestCase.java
@@ -22,11 +22,12 @@ import junit.framework.Assert;
import org.apache.log4j.Logger;
+import com.google.gson.reflect.TypeToken;
+
import com.cloud.gate.testcase.BaseTestCase;
import com.cloud.stack.CloudStackClient;
import com.cloud.stack.CloudStackCommand;
import com.cloud.stack.models.CloudStackUserVm;
-import com.google.gson.reflect.TypeToken;
public class CloudStackClientTestCase extends BaseTestCase {
protected final static Logger logger = Logger.getLogger(CloudStackClientTestCase.class);
@@ -57,8 +58,9 @@ public class CloudStackClientTestCase extends BaseTestCase {
command.setParam("page", "1");
command.setParam("pagesize", "20");
try {
- List<CloudStackUserVm> vms = client.listCall(command, API_KEY, SECRET_KEY, "listvirtualmachinesresponse", "virtualmachine", new TypeToken<List<CloudStackUserVm>>() {
- }.getType());
+ List<CloudStackUserVm> vms =
+ client.listCall(command, API_KEY, SECRET_KEY, "listvirtualmachinesresponse", "virtualmachine", new TypeToken<List<CloudStackUserVm>>() {
+ }.getType());
for (CloudStackUserVm vm : vms) {
logger.info("id: " + vm.getId() + ", name: " + vm.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/test/com/cloud/gate/util/JsonAccessorTestCase.java
----------------------------------------------------------------------
diff --git a/awsapi/test/com/cloud/gate/util/JsonAccessorTestCase.java b/awsapi/test/com/cloud/gate/util/JsonAccessorTestCase.java
index 8b59f53..8603e59 100644
--- a/awsapi/test/com/cloud/gate/util/JsonAccessorTestCase.java
+++ b/awsapi/test/com/cloud/gate/util/JsonAccessorTestCase.java
@@ -20,13 +20,14 @@ import junit.framework.Assert;
import org.apache.log4j.Logger;
-import com.cloud.bridge.util.JsonAccessor;
-import com.cloud.gate.testcase.BaseTestCase;
-import com.cloud.stack.models.CloudStackSnapshot;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
+import com.cloud.bridge.util.JsonAccessor;
+import com.cloud.gate.testcase.BaseTestCase;
+import com.cloud.stack.models.CloudStackSnapshot;
+
public class JsonAccessorTestCase extends BaseTestCase {
protected final static Logger logger = Logger.getLogger(UtilTestCase.class);
@@ -53,7 +54,8 @@ public class JsonAccessorTestCase extends BaseTestCase {
}
public void testGson() {
- String response = "{ \"queryasyncjobresultresponse\" : {\"jobid\":5868,\"jobstatus\":1,\"jobprocstatus\":0,\"jobresultcode\":0,\"jobresulttype\":\"object\",\"jobresult\":{\"snapshot\":{\"id\":3161,\"account\":\"admin\",\"domainid\":1,\"domain\":\"ROOT\",\"snapshottype\":\"MANUAL\",\"volumeid\":186928,\"volumename\":\"KY-DATA-VOL\",\"volumetype\":\"DATADISK\",\"created\":\"2011-06-02T05:05:41-0700\",\"name\":\"i-2-246446-VM_KY-DATA-VOL_20110602120541\",\"intervaltype\":\"MANUAL\",\"state\":\"BackedUp\"}}}}";
+ String response =
+ "{ \"queryasyncjobresultresponse\" : {\"jobid\":5868,\"jobstatus\":1,\"jobprocstatus\":0,\"jobresultcode\":0,\"jobresulttype\":\"object\",\"jobresult\":{\"snapshot\":{\"id\":3161,\"account\":\"admin\",\"domainid\":1,\"domain\":\"ROOT\",\"snapshottype\":\"MANUAL\",\"volumeid\":186928,\"volumename\":\"KY-DATA-VOL\",\"volumetype\":\"DATADISK\",\"created\":\"2011-06-02T05:05:41-0700\",\"name\":\"i-2-246446-VM_KY-DATA-VOL_20110602120541\",\"intervaltype\":\"MANUAL\",\"state\":\"BackedUp\"}}}}";
JsonParser parser = new JsonParser();
JsonElement json = parser.parse(response);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/test/com/cloud/gate/util/UtilTestCase.java
----------------------------------------------------------------------
diff --git a/awsapi/test/com/cloud/gate/util/UtilTestCase.java b/awsapi/test/com/cloud/gate/util/UtilTestCase.java
index b9b43d2..3e25622 100644
--- a/awsapi/test/com/cloud/gate/util/UtilTestCase.java
+++ b/awsapi/test/com/cloud/gate/util/UtilTestCase.java
@@ -23,6 +23,8 @@ import java.util.Calendar;
import java.util.Date;
import java.util.List;
+import junit.framework.Assert;
+
import org.apache.log4j.Logger;
import com.cloud.bridge.util.DateHelper;
@@ -33,8 +35,6 @@ import com.cloud.bridge.util.XSerializerJsonAdapter;
import com.cloud.bridge.util.XSerializerXmlAdapter;
import com.cloud.gate.testcase.BaseTestCase;
-import junit.framework.Assert;
-
class SubFoo {
@XElement(name = "Name")
private String name;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/AgentControlCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/AgentControlCommand.java b/core/src/com/cloud/agent/api/AgentControlCommand.java
index 772bc45..5d3de86 100644
--- a/core/src/com/cloud/agent/api/AgentControlCommand.java
+++ b/core/src/com/cloud/agent/api/AgentControlCommand.java
@@ -21,6 +21,7 @@ public class AgentControlCommand extends Command {
public AgentControlCommand() {
}
+ @Override
public boolean executeInSequence() {
return false;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/AttachVolumeCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/AttachVolumeCommand.java b/core/src/com/cloud/agent/api/AttachVolumeCommand.java
index de78aea..db0cd0a 100644
--- a/core/src/com/cloud/agent/api/AttachVolumeCommand.java
+++ b/core/src/com/cloud/agent/api/AttachVolumeCommand.java
@@ -44,8 +44,8 @@ public class AttachVolumeCommand extends Command {
protected AttachVolumeCommand() {
}
- public AttachVolumeCommand(boolean attach, boolean managed, String vmName, StoragePoolType pooltype, String volumePath, String volumeName, Long volumeSize, Long deviceId,
- String chainInfo) {
+ public AttachVolumeCommand(boolean attach, boolean managed, String vmName, StoragePoolType pooltype, String volumePath, String volumeName, Long volumeSize,
+ Long deviceId, String chainInfo) {
this.attach = attach;
this._managed = managed;
this.vmName = vmName;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/BackupSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/BackupSnapshotCommand.java b/core/src/com/cloud/agent/api/BackupSnapshotCommand.java
index 3bc53be..6e1e3be 100644
--- a/core/src/com/cloud/agent/api/BackupSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/BackupSnapshotCommand.java
@@ -52,8 +52,8 @@ public class BackupSnapshotCommand extends SnapshotCommand {
* @param isVolumeInactive True if the volume belongs to a VM that is not running or is detached.
* @param secHostId This is the Id of the secondary storage.
*/
- public BackupSnapshotCommand(String secondaryStoragePoolURL, Long dcId, Long accountId, Long volumeId, Long snapshotId, Long secHostId, String volumePath, StoragePool pool,
- String snapshotUuid, String snapshotName, String prevSnapshotUuid, String prevBackupUuid, boolean isVolumeInactive, String vmName, int wait) {
+ public BackupSnapshotCommand(String secondaryStoragePoolURL, Long dcId, Long accountId, Long volumeId, Long snapshotId, Long secHostId, String volumePath,
+ StoragePool pool, String snapshotUuid, String snapshotName, String prevSnapshotUuid, String prevBackupUuid, boolean isVolumeInactive, String vmName, int wait) {
super(pool, secondaryStoragePoolURL, snapshotUuid, snapshotName, dcId, accountId, volumeId);
this.snapshotId = snapshotId;
this.prevSnapshotUuid = prevSnapshotUuid;
[14/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/client/AmazonEC2Stub.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/client/AmazonEC2Stub.java b/awsapi/src/com/amazon/ec2/client/AmazonEC2Stub.java
index 2002a0a..b6698a8 100644
--- a/awsapi/src/com/amazon/ec2/client/AmazonEC2Stub.java
+++ b/awsapi/src/com/amazon/ec2/client/AmazonEC2Stub.java
@@ -1131,9 +1131,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
public com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroupsResponse describePlacementGroups(
- com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroups describePlacementGroups0)
+ com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroups describePlacementGroups0)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -1150,8 +1150,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describePlacementGroups0, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "describePlacementGroups")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describePlacementGroups0, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "describePlacementGroups")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -1164,11 +1165,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroupsResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroupsResponse.class,
+ getEnvelopeNamespaces(_returnEnv));
return (com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroupsResponse)object;
@@ -1231,11 +1234,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
*/
public void startdescribePlacementGroups(
- com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroups describePlacementGroups0,
+ com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroups describePlacementGroups0,
- final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
+ final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[0].getName());
_operationClient.getOptions().setAction("DescribePlacementGroups");
@@ -1249,8 +1252,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describePlacementGroups0, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "describePlacementGroups")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describePlacementGroups0, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "describePlacementGroups")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -1265,8 +1269,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroupsResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroupsResponse.class,
+ getEnvelopeNamespaces(resultEnv));
callback.receiveResultdescribePlacementGroups((com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroupsResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -1361,9 +1366,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
public com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroupResponse createSecurityGroup(
- com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroup createSecurityGroup2)
+ com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroup createSecurityGroup2)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -1380,8 +1385,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSecurityGroup2, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "createSecurityGroup")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSecurityGroup2, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "createSecurityGroup")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -1394,11 +1400,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroupResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroupResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroupResponse)object;
@@ -1461,11 +1468,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
*/
public void startcreateSecurityGroup(
- com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroup createSecurityGroup2,
+ com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroup createSecurityGroup2,
- final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
+ final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[1].getName());
_operationClient.getOptions().setAction("CreateSecurityGroup");
@@ -1479,8 +1486,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSecurityGroup2, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "createSecurityGroup")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSecurityGroup2, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "createSecurityGroup")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -1495,8 +1503,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroupResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroupResponse.class,
+ getEnvelopeNamespaces(resultEnv));
callback.receiveResultcreateSecurityGroup((com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroupResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -1591,9 +1600,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
public com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttribute(
- com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute4)
+ com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute4)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -1610,8 +1619,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetNetworkInterfaceAttribute4, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "resetNetworkInterfaceAttribute")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetNetworkInterfaceAttribute4, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "resetNetworkInterfaceAttribute")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -1624,11 +1634,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttributeResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttributeResponse.class,
+ getEnvelopeNamespaces(_returnEnv));
return (com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttributeResponse)object;
@@ -1691,11 +1703,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
*/
public void startresetNetworkInterfaceAttribute(
- com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute4,
+ com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute4,
- final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
+ final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[2].getName());
_operationClient.getOptions().setAction("ResetNetworkInterfaceAttribute");
@@ -1709,8 +1721,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetNetworkInterfaceAttribute4, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "resetNetworkInterfaceAttribute")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetNetworkInterfaceAttribute4, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "resetNetworkInterfaceAttribute")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -1725,8 +1738,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttributeResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttributeResponse.class,
+ getEnvelopeNamespaces(resultEnv));
callback.receiveResultresetNetworkInterfaceAttribute((com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttributeResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -1821,9 +1835,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
public com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptionsResponse createDhcpOptions(
- com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptions createDhcpOptions6)
+ com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptions createDhcpOptions6)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -1840,8 +1854,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createDhcpOptions6, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "createDhcpOptions")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createDhcpOptions6, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "createDhcpOptions")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -1854,11 +1869,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptionsResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptionsResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptionsResponse)object;
@@ -1921,11 +1937,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
*/
public void startcreateDhcpOptions(
- com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptions createDhcpOptions6,
+ com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptions createDhcpOptions6,
- final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
+ final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[3].getName());
_operationClient.getOptions().setAction("CreateDhcpOptions");
@@ -1939,8 +1955,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createDhcpOptions6, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "createDhcpOptions")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createDhcpOptions6, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "createDhcpOptions")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -1955,8 +1972,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptionsResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptionsResponse.class,
+ getEnvelopeNamespaces(resultEnv));
callback.receiveResultcreateDhcpOptions((com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptionsResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -2051,9 +2069,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
public com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTableResponse createRouteTable(
- com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTable createRouteTable8)
+ com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTable createRouteTable8)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -2070,8 +2088,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createRouteTable8, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "createRouteTable")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createRouteTable8, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "createRouteTable")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -2084,11 +2103,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTableResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTableResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTableResponse)object;
@@ -2151,11 +2171,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
*/
public void startcreateRouteTable(
- com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTable createRouteTable8,
+ com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTable createRouteTable8,
- final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
+ final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[4].getName());
_operationClient.getOptions().setAction("CreateRouteTable");
@@ -2169,8 +2189,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createRouteTable8, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "createRouteTable")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createRouteTable8, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "createRouteTable")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -2185,8 +2206,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTableResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTableResponse.class,
+ getEnvelopeNamespaces(resultEnv));
callback.receiveResultcreateRouteTable((com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTableResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -2281,9 +2303,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
public com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnetsResponse describeSubnets(
- com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnets describeSubnets10)
+ com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnets describeSubnets10)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -2300,8 +2322,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSubnets10, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSubnets")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSubnets10, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSubnets")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -2314,11 +2337,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnetsResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnetsResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnetsResponse)object;
@@ -2381,11 +2405,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
*/
public void startdescribeSubnets(
- com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnets describeSubnets10,
+ com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnets describeSubnets10,
- final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
+ final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[5].getName());
_operationClient.getOptions().setAction("DescribeSubnets");
@@ -2399,8 +2423,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSubnets10, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSubnets")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSubnets10, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSubnets")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -2415,8 +2440,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnetsResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnetsResponse.class, getEnvelopeNamespaces(resultEnv));
callback.receiveResultdescribeSubnets((com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnetsResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -2511,9 +2536,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
public com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicenseResponse deactivateLicense(
- com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicense deactivateLicense12)
+ com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicense deactivateLicense12)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -2530,8 +2555,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deactivateLicense12, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "deactivateLicense")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deactivateLicense12, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "deactivateLicense")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -2544,11 +2570,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicenseResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicenseResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicenseResponse)object;
@@ -2611,11 +2638,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
*/
public void startdeactivateLicense(
- com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicense deactivateLicense12,
+ com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicense deactivateLicense12,
- final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
+ final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[6].getName());
_operationClient.getOptions().setAction("DeactivateLicense");
@@ -2629,8 +2656,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deactivateLicense12, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "deactivateLicense")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deactivateLicense12, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "deactivateLicense")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -2645,8 +2673,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicenseResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicenseResponse.class,
+ getEnvelopeNamespaces(resultEnv));
callback.receiveResultdeactivateLicense((com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicenseResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -2741,9 +2770,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
public com.amazon.ec2.client.AmazonEC2Stub.DeleteVpcResponse deleteVpc(
- com.amazon.ec2.client.AmazonEC2Stub.DeleteVpc deleteVpc14)
+ com.amazon.ec2.client.AmazonEC2Stub.DeleteVpc deleteVpc14)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -2760,8 +2789,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpc14, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpc")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpc14, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpc")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -2774,10 +2804,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpcResponse.class, getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpcResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.ec2.client.AmazonEC2Stub.DeleteVpcResponse)object;
@@ -2840,11 +2872,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
*/
public void startdeleteVpc(
- com.amazon.ec2.client.AmazonEC2Stub.DeleteVpc deleteVpc14,
+ com.amazon.ec2.client.AmazonEC2Stub.DeleteVpc deleteVpc14,
- final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
+ final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[7].getName());
_operationClient.getOptions().setAction("DeleteVpc");
@@ -2858,8 +2890,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpc14, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpc")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpc14, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpc")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -2874,8 +2907,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpcResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpcResponse.class, getEnvelopeNamespaces(resultEnv));
callback.receiveResultdeleteVpc((com.amazon.ec2.client.AmazonEC2Stub.DeleteVpcResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -2970,9 +3003,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
public com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequestsResponse cancelSpotInstanceRequests(
- com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequests cancelSpotInstanceRequests16)
+ com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequests cancelSpotInstanceRequests16)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -2989,8 +3022,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelSpotInstanceRequests16, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelSpotInstanceRequests")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelSpotInstanceRequests16, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelSpotInstanceRequests")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -3003,11 +3037,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequestsResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequestsResponse.class,
+ getEnvelopeNamespaces(_returnEnv));
return (com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequestsResponse)object;
@@ -3070,11 +3106,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
*/
public void startcancelSpotInstanceRequests(
- com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequests cancelSpotInstanceRequests16,
+ com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequests cancelSpotInstanceRequests16,
- final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
+ final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[8].getName());
_operationClient.getOptions().setAction("CancelSpotInstanceRequests");
@@ -3088,8 +3124,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelSpotInstanceRequests16, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelSpotInstanceRequests")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelSpotInstanceRequests16, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelSpotInstanceRequests")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -3104,8 +3141,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequestsResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequestsResponse.class,
+ getEnvelopeNamespaces(resultEnv));
callback.receiveResultcancelSpotInstanceRequests((com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequestsResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -3200,9 +3238,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
public com.amazon.ec2.client.AmazonEC2Stub.CreateSubnetResponse createSubnet(
- com.amazon.ec2.client.AmazonEC2Stub.CreateSubnet createSubnet18)
+ com.amazon.ec2.client.AmazonEC2Stub.CreateSubnet createSubnet18)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -3219,8 +3257,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSubnet18, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "createSubnet")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSubnet18, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "createSubnet")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -3233,11 +3272,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSubnetResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSubnetResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.ec2.client.AmazonEC2Stub.CreateSubnetResponse)object;
@@ -3300,11 +3340,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
*/
public void startcreateSubnet(
- com.amazon.ec2.client.AmazonEC2Stub.CreateSubnet createSubnet18,
+ com.amazon.ec2.client.AmazonEC2Stub.CreateSubnet createSubnet18,
- final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
+ final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[9].getName());
_operationClient.getOptions().setAction("CreateSubnet");
@@ -3318,8 +3358,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSubnet18, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "createSubnet")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSubnet18, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "createSubnet")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -3334,8 +3375,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSubnetResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSubnetResponse.class, getEnvelopeNamespaces(resultEnv));
callback.receiveResultcreateSubnet((com.amazon.ec2.client.AmazonEC2Stub.CreateSubnetResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -3430,9 +3471,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
public com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGatewayResponse deleteVpnGateway(
- com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGateway deleteVpnGateway20)
+ com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGateway deleteVpnGateway20)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -3449,8 +3490,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpnGateway20, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpnGateway")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpnGateway20, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpnGateway")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -3463,11 +3505,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGatewayResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGatewayResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGatewayResponse)object;
@@ -3530,11 +3573,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
*/
public void startdeleteVpnGateway(
- com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGateway deleteVpnGateway20,
+ com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGateway deleteVpnGateway20,
- final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
+ final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[10].getName());
_operationClient.getOptions().setAction("DeleteVpnGateway");
@@ -3548,8 +3591,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpnGateway20, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpnGateway")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpnGateway20, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpnGateway")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -3564,8 +3608,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGatewayResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGatewayResponse.class,
+ getEnvelopeNamespaces(resultEnv));
callback.receiveResultdeleteVpnGateway((com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGatewayResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -3660,9 +3705,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
public com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntryResponse createNetworkAclEntry(
- com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntry createNetworkAclEntry22)
+ com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntry createNetworkAclEntry22)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -3679,8 +3724,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createNetworkAclEntry22, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "createNetworkAclEntry")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createNetworkAclEntry22, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "createNetworkAclEntry")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -3693,11 +3739,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntryResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntryResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntryResponse)object;
@@ -3760,11 +3807,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
*/
public void startcreateNetworkAclEntry(
- com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntry createNetworkAclEntry22,
+ com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntry createNetworkAclEntry22,
- final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
+ final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[11].getName());
_operationClient.getOptions().setAction("CreateNetworkAclEntry");
@@ -3778,8 +3825,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createNetworkAclEntry22, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "createNetworkAclEntry")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createNetworkAclEntry22, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "createNetworkAclEntry")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -3794,8 +3842,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntryResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntryResponse.class,
+ getEnvelopeNamespaces(resultEnv));
callback.receiveResultcreateNetworkAclEntry((com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntryResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -3890,9 +3939,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
public com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstancesResponse requestSpotInstances(
- com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstances requestSpotInstances24)
+ com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstances requestSpotInstances24)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -3909,8 +3958,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), requestSpotInstances24, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "requestSpotInstances")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), requestSpotInstances24, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "requestSpotInstances")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -3923,11 +3973,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstancesResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstancesResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstancesResponse)object;
@@ -3990,11 +4041,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
*/
public void startrequestSpotInstances(
- com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstances requestSpotInstances24,
+ com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstances requestSpotInstances24,
- final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
+ final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[12].getName());
_operationClient.getOptions().setAction("RequestSpotInstances");
@@ -4008,8 +4059,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), requestSpotInstances24, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "requestSpotInstances")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), requestSpotInstances24, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "requestSpotInstances")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -4024,8 +4076,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstancesResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstancesResponse.class,
+ getEnvelopeNamespaces(resultEnv));
callback.receiveResultrequestSpotInstances((com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstancesResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -4120,9 +4173,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
public com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttributeResponse describeVolumeAttribute(
- com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttribute describeVolumeAttribute26)
+ com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttribute describeVolumeAttribute26)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -4139,8 +4192,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVolumeAttribute26, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVolumeAttribute")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVolumeAttribute26, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVolumeAttribute")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -4153,11 +4207,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttributeResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttributeResponse.class,
+ getEnvelopeNamespaces(_returnEnv));
return (com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttributeResponse)object;
@@ -4220,11 +4276,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
*/
public void startdescribeVolumeAttribute(
- com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttribute describeVolumeAttribute26,
+ com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttribute describeVolumeAttribute26,
- final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
+ final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[13].getName());
_operationClient.getOptions().setAction("DescribeVolumeAttribute");
@@ -4238,8 +4294,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVolumeAttribute26, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVolumeAttribute")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVolumeAttribute26, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVolumeAttribute")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -4254,8 +4311,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttributeResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttributeResponse.class,
+ getEnvelopeNamespaces(resultEnv));
callback.receiveResultdescribeVolumeAttribute((com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttributeResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -4350,9 +4408,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
public com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptionsResponse associateDhcpOptions(
- com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptions associateDhcpOptions28)
+ com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptions associateDhcpOptions28)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -4369,8 +4427,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), associateDhcpOptions28, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "associateDhcpOptions")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), associateDhcpOptions28, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "associateDhcpOptions")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -4383,11 +4442,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptionsResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptionsResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptionsResponse)object;
@@ -4450,11 +4510,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
*/
public void startassociateDhcpOptions(
- com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptions associateDhcpOptions28,
+ com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptions associateDhcpOptions28,
- final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
+ final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[14].getName());
_operationClient.getOptions().setAction("AssociateDhcpOptions");
@@ -4468,8 +4528,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), associateDhcpOptions28, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "associateDhcpOptions")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), associateDhcpOptions28, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "associateDhcpOptions")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -4484,8 +4545,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptionsResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptionsResponse.class,
+ getEnvelopeNamespaces(resultEnv));
callback.receiveResultassociateDhcpOptions((com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptionsResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -4580,9 +4642,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
public com.amazon.ec2.client.AmazonEC2Stub.DescribeTagsResponse describeTags(
- com.amazon.ec2.client.AmazonEC2Stub.DescribeTags describeTags30)
+ com.amazon.ec2.client.AmazonEC2Stub.DescribeTags describeTags30)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -4599,8 +4661,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeTags30, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "describeTags")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeTags30, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "describeTags")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -4613,11 +4676,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeTagsResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeTagsResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.ec2.client.AmazonEC2Stub.DescribeTagsResponse)object;
@@ -4680,11 +4744,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
*/
public void startdescribeTags(
- com.amazon.ec2.client.AmazonEC2Stub.DescribeTags describeTags30,
+ com.amazon.ec2.client.AmazonEC2Stub.DescribeTags describeTags30,
- final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
+ final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[15].getName());
_operationClient.getOptions().setAction("DescribeTags");
@@ -4698,8 +4762,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeTags30, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "describeTags")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeTags30, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "describeTags")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -4714,8 +4779,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeTagsResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeTagsResponse.class, getEnvelopeNamespaces(resultEnv));
callback.receiveResultdescribeTags((com.amazon.ec2.client.AmazonEC2Stub.DescribeTagsResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -4810,9 +4875,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
public com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPairResponse importKeyPair(
- com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPair importKeyPair32)
+ com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPair importKeyPair32)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -4829,8 +4894,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), importKeyPair32, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "importKeyPair")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), importKeyPair32, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "importKeyPair")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -4843,11 +4909,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPairResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPairResponse.class, getEnvelopeNamespaces(_returnEnv));
return (com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPairResponse)object;
@@ -4910,11 +4977,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
*/
public void startimportKeyPair(
- com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPair importKeyPair32,
+ com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPair importKeyPair32,
- final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
+ final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[16].getName());
_operationClient.getOptions().setAction("ImportKeyPair");
@@ -4928,8 +4995,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), importKeyPair32, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "importKeyPair")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), importKeyPair32, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "importKeyPair")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -4944,8 +5012,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPairResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPairResponse.class, getEnvelopeNamespaces(resultEnv));
callback.receiveResultimportKeyPair((com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPairResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -5040,9 +5108,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
public com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterfaceResponse deleteNetworkInterface(
- com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterface deleteNetworkInterface34)
+ com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterface deleteNetworkInterface34)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -5059,8 +5127,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteNetworkInterface34, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteNetworkInterface")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteNetworkInterface34, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteNetworkInterface")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -5073,11 +5142,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterfaceResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterfaceResponse.class,
+ getEnvelopeNamespaces(_returnEnv));
return (com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterfaceResponse)object;
@@ -5140,11 +5211,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
*/
public void startdeleteNetworkInterface(
- com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterface deleteNetworkInterface34,
+ com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterface deleteNetworkInterface34,
- final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
+ final com.amazon.ec2.client.AmazonEC2CallbackHandler callback)
- throws java.rmi.RemoteException {
+ throws java.rmi.RemoteException {
org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[17].getName());
_operationClient.getOptions().setAction("DeleteNetworkInterface");
@@ -5158,8 +5229,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//Style is Doc.
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteNetworkInterface34, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteNetworkInterface")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteNetworkInterface34, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteNetworkInterface")));
// adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -5174,8 +5246,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
- java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterfaceResponse.class,
- getEnvelopeNamespaces(resultEnv));
+ java.lang.Object object =
+ fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterfaceResponse.class,
+ getEnvelopeNamespaces(resultEnv));
callback.receiveResultdeleteNetworkInterface((com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterfaceResponse)object);
} catch (org.apache.axis2.AxisFault e) {
@@ -5270,9 +5343,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
public com.amazon.ec2.client.AmazonEC2Stub.DescribeVpcsResponse describeVpcs(
- com.amazon.ec2.client.AmazonEC2Stub.DescribeVpcs describeVpcs36)
+ com.amazon.ec2.client.AmazonEC2Stub.DescribeVpcs describeVpcs36)
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
org.apache.axis2.context.MessageContext _messageContext = null;
@@ -5289,8 +5362,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
// create SOAP envelope with that payload
org.apache.axiom.soap.SOAPEnvelope env = null;
- env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVpcs36, optimizeContent(new javax.xml.namespace.QName(
- "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVpcs")));
+ env =
+ toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVpcs36, optimizeContent(new javax.xml.namespace.QName(
+ "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVpcs")));
//adding SOAP soap_headers
_serviceClient.addHeadersToEnvelope(env);
@@ -5303,11 +5377,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub {
//execute the operation client
_operationClient.execute(true);
- org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ org.apache.axis2.context.MessageContext _returnMessageContext =
+ _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE);
org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope();
- java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVpcsResponse.class,
- getEnvelopeNamespaces(_returnEnv));
+ java.lang.Object object =
+ fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVpcsResponse.class, getEnvelopeNamespaces(_returnEnv));
<TRUNCATED>
[42/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
index c12b939..7180f4e 100755
--- a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
@@ -78,7 +78,11 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, required = true, description = "availability zone for the virtual machine")
+ @Parameter(name = ApiConstants.ZONE_ID,
+ type = CommandType.UUID,
+ entityType = ZoneResponse.class,
+ required = true,
+ description = "availability zone for the virtual machine")
private Long zoneId;
@ACL
@@ -128,10 +132,10 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
type = CommandType.UUID,
entityType = DiskOfferingResponse.class,
description = "the ID of the disk offering for the virtual machine. If the template is of ISO format,"
- + " the diskOfferingId is for the root disk volume. Otherwise this parameter is used to indicate the "
- + "offering for the data disk volume. If the templateId parameter passed is from a Template object,"
- + " the diskOfferingId refers to a DATA Disk Volume created. If the templateId parameter passed is "
- + "from an ISO object, the diskOfferingId refers to a ROOT Disk Volume created.")
+ + " the diskOfferingId is for the root disk volume. Otherwise this parameter is used to indicate the "
+ + "offering for the data disk volume. If the templateId parameter passed is from a Template object,"
+ + " the diskOfferingId refers to a DATA Disk Volume created. If the templateId parameter passed is "
+ + "from an ISO object, the diskOfferingId refers to a ROOT Disk Volume created.")
private Long diskOfferingId;
@Parameter(name = ApiConstants.SIZE, type = CommandType.LONG, description = "the arbitrary size for the DATADISK volume. Mutually exclusive with diskOfferingId")
@@ -164,7 +168,7 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
collectionType = CommandType.UUID,
entityType = SecurityGroupResponse.class,
description = "comma separated list of security groups id that going to be applied to the virtual machine. "
- + "Should be passed only when vm is created from a zone with Basic Network support." + " Mutually exclusive with securitygroupnames parameter")
+ + "Should be passed only when vm is created from a zone with Basic Network support." + " Mutually exclusive with securitygroupnames parameter")
private List<Long> securityGroupIdList;
@ACL
@@ -173,13 +177,13 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
collectionType = CommandType.STRING,
entityType = SecurityGroupResponse.class,
description = "comma separated list of security groups names that going to be applied to the virtual machine."
- + " Should be passed only when vm is created from a zone with Basic Network support. " + "Mutually exclusive with securitygroupids parameter")
+ + " Should be passed only when vm is created from a zone with Basic Network support. " + "Mutually exclusive with securitygroupids parameter")
private List<String> securityGroupNameList;
@Parameter(name = ApiConstants.IP_NETWORK_LIST,
type = CommandType.MAP,
description = "ip to network mapping. Can't be specified with networkIds parameter."
- + " Example: iptonetworklist[0].ip=10.10.10.11&iptonetworklist[0].ipv6=fc00:1234:5678::abcd&iptonetworklist[0].networkid=uuid - requests to use ip 10.10.10.11 in network id=uuid")
+ + " Example: iptonetworklist[0].ip=10.10.10.11&iptonetworklist[0].ipv6=fc00:1234:5678::abcd&iptonetworklist[0].networkid=uuid - requests to use ip 10.10.10.11 in network id=uuid")
private Map ipToNetworkList;
@Parameter(name = ApiConstants.IP_ADDRESS, type = CommandType.STRING, description = "the ip address for default vm's network")
@@ -196,7 +200,9 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
@Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "Deploy vm for the project")
private Long projectId;
- @Parameter(name = ApiConstants.START_VM, type = CommandType.BOOLEAN, description = "true if network offering supports specifying ip ranges; defaulted to true if not specified")
+ @Parameter(name = ApiConstants.START_VM,
+ type = CommandType.BOOLEAN,
+ description = "true if network offering supports specifying ip ranges; defaulted to true if not specified")
private Boolean startVm;
@ACL
@@ -205,7 +211,7 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
collectionType = CommandType.UUID,
entityType = AffinityGroupResponse.class,
description = "comma separated list of affinity groups id that are going to be applied to the virtual machine."
- + " Mutually exclusive with affinitygroupnames parameter")
+ + " Mutually exclusive with affinitygroupnames parameter")
private List<Long> affinityGroupIdList;
@ACL
@@ -214,10 +220,13 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
collectionType = CommandType.STRING,
entityType = AffinityGroupResponse.class,
description = "comma separated list of affinity groups names that are going to be applied to the virtual machine."
- + "Mutually exclusive with affinitygroupids parameter")
+ + "Mutually exclusive with affinitygroupids parameter")
private List<String> affinityGroupNameList;
- @Parameter(name = ApiConstants.DISPLAY_VM, type = CommandType.BOOLEAN, since = "4.2", description = "an optional field, whether to the display the vm to the end user or not.")
+ @Parameter(name = ApiConstants.DISPLAY_VM,
+ type = CommandType.BOOLEAN,
+ since = "4.2",
+ description = "an optional field, whether to the display the vm to the end user or not.")
private Boolean displayVm;
@Parameter(name = ApiConstants.CPU_SPEED,
@@ -226,7 +235,10 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
description = "optional field to specify the cpu speed when using dynamic compute offering.")
private Integer cpuSpeed;
- @Parameter(name = ApiConstants.MEMORY, type = CommandType.INTEGER, since = "4.3", description = "optional field to specify the memory when using dynamic compute offering")
+ @Parameter(name = ApiConstants.MEMORY,
+ type = CommandType.INTEGER,
+ since = "4.3",
+ description = "optional field to specify the memory when using dynamic compute offering")
private Integer memory;
@Parameter(name = ApiConstants.CPU_NUMBER,
@@ -561,23 +573,26 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
if (getNetworkIds() != null) {
throw new InvalidParameterValueException("Can't specify network Ids in Basic zone");
} else {
- vm = _userVmService.createBasicSecurityGroupVirtualMachine(zone, serviceOffering, template, getSecurityGroupIdList(), owner, name, displayName, diskOfferingId,
- size, group, getHypervisor(), getHttpMethod(), userData, sshKeyPairName, getIpToNetworkMap(), addrs, displayVm, keyboard, getAffinityGroupIdList(),
- cpuSpeed, memory, cpuNumber, rootdisksize);
+ vm =
+ _userVmService.createBasicSecurityGroupVirtualMachine(zone, serviceOffering, template, getSecurityGroupIdList(), owner, name, displayName,
+ diskOfferingId, size, group, getHypervisor(), getHttpMethod(), userData, sshKeyPairName, getIpToNetworkMap(), addrs, displayVm, keyboard,
+ getAffinityGroupIdList(), cpuSpeed, memory, cpuNumber, rootdisksize);
}
} else {
if (zone.isSecurityGroupEnabled()) {
- vm = _userVmService.createAdvancedSecurityGroupVirtualMachine(zone, serviceOffering, template, getNetworkIds(), getSecurityGroupIdList(), owner, name,
- displayName, diskOfferingId, size, group, getHypervisor(), getHttpMethod(), userData, sshKeyPairName, getIpToNetworkMap(), addrs, displayVm, keyboard,
- getAffinityGroupIdList(), cpuSpeed, memory, cpuNumber, rootdisksize);
+ vm =
+ _userVmService.createAdvancedSecurityGroupVirtualMachine(zone, serviceOffering, template, getNetworkIds(), getSecurityGroupIdList(), owner, name,
+ displayName, diskOfferingId, size, group, getHypervisor(), getHttpMethod(), userData, sshKeyPairName, getIpToNetworkMap(), addrs, displayVm,
+ keyboard, getAffinityGroupIdList(), cpuSpeed, memory, cpuNumber, rootdisksize);
} else {
if (getSecurityGroupIdList() != null && !getSecurityGroupIdList().isEmpty()) {
throw new InvalidParameterValueException("Can't create vm with security groups; security group feature is not enabled per zone");
}
- vm = _userVmService.createAdvancedVirtualMachine(zone, serviceOffering, template, getNetworkIds(), owner, name, displayName, diskOfferingId, size, group,
- getHypervisor(), getHttpMethod(), userData, sshKeyPairName, getIpToNetworkMap(), addrs, displayVm, keyboard, getAffinityGroupIdList(), cpuSpeed, memory,
- cpuNumber, rootdisksize);
+ vm =
+ _userVmService.createAdvancedVirtualMachine(zone, serviceOffering, template, getNetworkIds(), owner, name, displayName, diskOfferingId, size,
+ group, getHypervisor(), getHttpMethod(), userData, sshKeyPairName, getIpToNetworkMap(), addrs, displayVm, keyboard, getAffinityGroupIdList(),
+ cpuSpeed, memory, cpuNumber, rootdisksize);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
index 13a6e5f..3c63e8d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.vm;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -27,7 +29,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
@@ -100,10 +101,12 @@ public class DestroyVMCmd extends BaseAsyncCmd {
return "destroying vm: " + getId();
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.VirtualMachine;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java
index 8c09c28..d0503d1 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.command.user.vm;
import java.security.InvalidParameterException;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.GetVMPasswordResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java
index 0e32c58..8cb9575 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java
@@ -39,7 +39,6 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
import com.cloud.vm.Nic;
-import com.cloud.vm.NicSecondaryIp;
@APICommand(name = "listNics", description = "list the vm nics IP to NIC", responseObject = NicResponse.class)
public class ListNicsCmd extends BaseListCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
index 885c21b..3f161c1 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
@@ -20,6 +20,8 @@ import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
@@ -38,7 +40,6 @@ import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VpcResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.InvalidParameterValueException;
@@ -84,15 +85,18 @@ public class ListVMsCmd extends BaseListTaggedResourcesCmd {
@Parameter(name = ApiConstants.HYPERVISOR, type = CommandType.STRING, description = "the target hypervisor for the template")
private String hypervisor;
- @Parameter(name = ApiConstants.STORAGE_ID, type = CommandType.UUID, entityType = StoragePoolResponse.class, description = "the storage ID where vm's volumes belong to")
+ @Parameter(name = ApiConstants.STORAGE_ID,
+ type = CommandType.UUID,
+ entityType = StoragePoolResponse.class,
+ description = "the storage ID where vm's volumes belong to")
private Long storageId;
@Parameter(name = ApiConstants.DETAILS,
type = CommandType.LIST,
collectionType = CommandType.STRING,
description = "comma separated list of host details requested, "
- + "value can be a list of [all, group, nics, stats, secgrp, tmpl, servoff, iso, volume, min, affgrp]."
- + " If no parameter is passed in, the details will be defaulted to all")
+ + "value can be a list of [all, group, nics, stats, secgrp, tmpl, servoff, iso, volume, min, affgrp]."
+ + " If no parameter is passed in, the details will be defaulted to all")
private List<String> viewDetails;
@Parameter(name = ApiConstants.TEMPLATE_ID, type = CommandType.UUID, entityType = TemplateResponse.class, description = "list vms by template")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
index 77f3721..7ac9138 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vm;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,12 +28,9 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
@@ -84,10 +83,12 @@ public class RebootVMCmd extends BaseAsyncCmd {
return "rebooting user vm: " + getId();
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.VirtualMachine;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java
index 1a1220a..6cbb78b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java
@@ -32,11 +32,9 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
import com.cloud.event.EventTypes;
-import com.cloud.exception.InsufficientAddressCapacityException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.Network;
import com.cloud.user.Account;
-import com.cloud.vm.Nic;
import com.cloud.vm.NicSecondaryIp;
@APICommand(name = "removeIpFromNic", description = "Assigns secondary IP to NIC.", responseObject = SuccessResponse.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java
index 1b01f06..92becb7 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java
@@ -21,17 +21,18 @@ import java.util.EnumSet;
import org.apache.log4j.Logger;
-import org.apache.cloudstack.api.*;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiConstants.VMDetails;
-import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.NicResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
import com.cloud.event.EventTypes;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
index 7ea20b0..df34120 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vm;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,18 +28,14 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "resetPasswordForVirtualMachine",
- responseObject = UserVmResponse.class,
- description = "Resets the password for virtual machine. " + "The virtual machine must be in a \"Stopped\" state and the template must already "
- + "support this feature for this command to take effect. [async]")
+@APICommand(name = "resetPasswordForVirtualMachine", responseObject = UserVmResponse.class, description = "Resets the password for virtual machine. "
+ + "The virtual machine must be in a \"Stopped\" state and the template must already " + "support this feature for this command to take effect. [async]")
public class ResetVMPasswordCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ResetVMPasswordCmd.class.getName());
@@ -99,10 +97,12 @@ public class ResetVMPasswordCmd extends BaseAsyncCmd {
return "resetting password for vm: " + getId();
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.VirtualMachine;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
index ece0eba..7436e3d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
@@ -19,27 +19,26 @@ package org.apache.cloudstack.api.command.user.vm;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
-import com.cloud.user.Account;
-import com.cloud.uservm.UserVm;
import com.cloud.event.EventTypes;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.user.Account;
+import com.cloud.uservm.UserVm;
@APICommand(name = "resetSSHKeyForVirtualMachine", responseObject = UserVmResponse.class, description = "Resets the SSH Key for virtual machine. "
- + "The virtual machine must be in a \"Stopped\" state. [async]")
+ + "The virtual machine must be in a \"Stopped\" state. [async]")
public class ResetVMSSHKeyCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ResetVMSSHKeyCmd.class.getName());
@@ -107,6 +106,7 @@ public class ResetVMSSHKeyCmd extends BaseAsyncCmd {
return "resetting SSHKey for vm: " + getId();
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.VirtualMachine;
}
@@ -126,6 +126,7 @@ public class ResetVMSSHKeyCmd extends BaseAsyncCmd {
return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
index 6d1348d..b69b364 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vm;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@@ -36,7 +36,10 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "restoreVirtualMachine", description = "Restore a VM to original template/ISO or new template/ISO", responseObject = UserVmResponse.class, since = "3.0.0")
+@APICommand(name = "restoreVirtualMachine",
+ description = "Restore a VM to original template/ISO or new template/ISO",
+ responseObject = UserVmResponse.class,
+ since = "3.0.0")
public class RestoreVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RestoreVMCmd.class);
private static final String s_name = "restorevmresponse";
@@ -61,7 +64,8 @@ public class RestoreVMCmd extends BaseAsyncCmd {
}
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException {
UserVm result;
CallContext.current().setEventDetails("Vm Id: " + getVmId());
result = _userVmService.restoreVM(this);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
index a2d0ae4..6cb49c1 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
@@ -16,20 +16,28 @@
// under the License.
package org.apache.cloudstack.api.command.user.vm;
-import com.cloud.event.EventTypes;
-import com.cloud.exception.*;
-import com.cloud.user.Account;
-import com.cloud.uservm.UserVm;
+import java.util.List;
+
+import org.apache.log4j.Logger;
-import org.apache.cloudstack.api.*;
+import org.apache.cloudstack.api.ACL;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
-import java.util.List;
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.ManagementServerException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.exception.VirtualMachineMigrationException;
+import com.cloud.user.Account;
+import com.cloud.uservm.UserVm;
@APICommand(name = "scaleVirtualMachine", description = "Scales the virtual machine to a new service offering.", responseObject = SuccessResponse.class)
public class ScaleVMCmd extends BaseAsyncCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
index 9316c21..4239a64 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vm;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@@ -106,10 +106,12 @@ public class StartVMCmd extends BaseAsyncCmd {
return "starting user vm: " + getId();
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.VirtualMachine;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
index 420c318..17f12f9 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vm;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
@@ -27,11 +29,8 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
@@ -49,10 +48,8 @@ public class StopVMCmd extends BaseAsyncCmd {
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = UserVmResponse.class, required = true, description = "The ID of the virtual machine")
private Long id;
- @Parameter(name = ApiConstants.FORCED,
- type = CommandType.BOOLEAN,
- required = false,
- description = "Force stop the VM " + "(vm is marked as Stopped even when command fails to be send to the backend). The caller knows the VM is stopped.")
+ @Parameter(name = ApiConstants.FORCED, type = CommandType.BOOLEAN, required = false, description = "Force stop the VM "
+ + "(vm is marked as Stopped even when command fails to be send to the backend). The caller knows the VM is stopped.")
private Boolean forced;
// ///////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java
index b26b450..f699cce 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java
@@ -21,17 +21,18 @@ import java.util.EnumSet;
import org.apache.log4j.Logger;
-import org.apache.cloudstack.api.*;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiConstants.VMDetails;
-import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.NicResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
import com.cloud.event.EventTypes;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
index adca765..fbb785f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vm;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,16 +28,14 @@ import org.apache.cloudstack.api.response.GuestOSResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
@APICommand(name = "updateVirtualMachine", description = "Updates properties of a virtual machine. The VM has to be stopped and restarted for the "
- + "new properties to take effect. UpdateVirtualMachine does not first check whether the VM is stopped. "
- + "Therefore, stop the VM manually before issuing this call.", responseObject = UserVmResponse.class)
+ + "new properties to take effect. UpdateVirtualMachine does not first check whether the VM is stopped. "
+ + "Therefore, stop the VM manually before issuing this call.", responseObject = UserVmResponse.class)
public class UpdateVMCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateVMCmd.class.getName());
private static final String s_name = "updatevirtualmachineresponse";
@@ -56,7 +56,10 @@ public class UpdateVMCmd extends BaseCmd {
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = UserVmResponse.class, required = true, description = "The ID of the virtual machine")
private Long id;
- @Parameter(name = ApiConstants.OS_TYPE_ID, type = CommandType.UUID, entityType = GuestOSResponse.class, description = "the ID of the OS type that best represents this VM.")
+ @Parameter(name = ApiConstants.OS_TYPE_ID,
+ type = CommandType.UUID,
+ entityType = GuestOSResponse.class,
+ description = "the ID of the OS type that best represents this VM.")
private Long osTypeId;
@Parameter(name = ApiConstants.USER_DATA,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
index 4816bbe..3dfcdf9 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
@@ -35,8 +35,7 @@ import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
@APICommand(name = "changeServiceForVirtualMachine", responseObject = UserVmResponse.class, description = "Changes the service offering for a virtual machine. "
- + "The virtual machine must be in a \"Stopped\" state for "
- + "this command to take effect.")
+ + "The virtual machine must be in a \"Stopped\" state for " + "this command to take effect.")
public class UpgradeVMCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpgradeVMCmd.class.getName());
private static final String s_name = "changeserviceforvirtualmachineresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java
index e8782f0..937fca3 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vmgroup;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,9 +26,8 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.InstanceGroupResponse;
-import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.api.response.ProjectResponse;
-import org.apache.log4j.Logger;
+import org.apache.cloudstack.context.CallContext;
import com.cloud.vm.InstanceGroup;
@@ -48,7 +49,10 @@ public class CreateVMGroupCmd extends BaseCmd {
description = "the account of the instance group. The account parameter must be used with the domainId parameter.")
private String accountName;
- @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "the domain ID of account owning the instance group")
+ @Parameter(name = ApiConstants.DOMAIN_ID,
+ type = CommandType.UUID,
+ entityType = DomainResponse.class,
+ description = "the domain ID of account owning the instance group")
private Long domainId;
@Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "The project of the instance group")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java
index 0b50315..fbfb85a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vmgroup;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.InstanceGroupResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
import com.cloud.vm.InstanceGroup;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java
index 7ac2a66..fda3e88 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.command.user.vmgroup;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.InstanceGroupResponse;
import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.log4j.Logger;
@APICommand(name = "listInstanceGroups", description = "Lists vm groups", responseObject = InstanceGroupResponse.class)
public class ListVMGroupsCmd extends BaseListProjectAndAccountResourcesCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java
index 0399f30..1930bd8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vmgroup;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.InstanceGroupResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
import com.cloud.vm.InstanceGroup;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java
index af4f2e5..d29ff05 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java
@@ -17,6 +17,8 @@
package org.apache.cloudstack.api.command.user.vmsnapshot;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.VMSnapshotResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.vm.snapshot.VMSnapshot;
@@ -38,7 +38,11 @@ public class DeleteVMSnapshotCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteVMSnapshotCmd.class.getName());
private static final String s_name = "deletevmsnapshotresponse";
- @Parameter(name = ApiConstants.VM_SNAPSHOT_ID, type = CommandType.UUID, entityType = VMSnapshotResponse.class, required = true, description = "The ID of the VM snapshot")
+ @Parameter(name = ApiConstants.VM_SNAPSHOT_ID,
+ type = CommandType.UUID,
+ entityType = VMSnapshotResponse.class,
+ required = true,
+ description = "The ID of the VM snapshot")
private Long id;
public Long getId() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java
index 5b6097c..cec2154 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java
@@ -42,7 +42,11 @@ public class RevertToVMSnapshotCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RevertToVMSnapshotCmd.class.getName());
private static final String s_name = "reverttovmsnapshotresponse";
- @Parameter(name = ApiConstants.VM_SNAPSHOT_ID, type = CommandType.UUID, required = true, entityType = VMSnapshotResponse.class, description = "The ID of the vm snapshot")
+ @Parameter(name = ApiConstants.VM_SNAPSHOT_ID,
+ type = CommandType.UUID,
+ required = true,
+ entityType = VMSnapshotResponse.class,
+ description = "The ID of the vm snapshot")
private Long vmSnapShotId;
public Long getVmSnapShotId() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
index db67276..cd1e1ed 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.volume;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.storage.Volume;
import com.cloud.user.Account;
@@ -43,10 +43,8 @@ public class AttachVolumeCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Parameter(name = ApiConstants.DEVICE_ID, type = CommandType.LONG, description = "the ID of the device to map the volume to within the guest OS. "
- + "If no deviceId is passed in, the next available deviceId will be chosen. "
- + "Possible values for a Linux OS are:" + "* 1 - /dev/xvdb" + "* 2 - /dev/xvdc"
- + "* 4 - /dev/xvde" + "* 5 - /dev/xvdf" + "* 6 - /dev/xvdg" + "* 7 - /dev/xvdh"
- + "* 8 - /dev/xvdi" + "* 9 - /dev/xvdj")
+ + "If no deviceId is passed in, the next available deviceId will be chosen. " + "Possible values for a Linux OS are:" + "* 1 - /dev/xvdb" + "* 2 - /dev/xvdc"
+ + "* 4 - /dev/xvde" + "* 5 - /dev/xvdf" + "* 6 - /dev/xvdg" + "* 7 - /dev/xvdh" + "* 8 - /dev/xvdi" + "* 9 - /dev/xvdj")
private Long deviceId;
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = VolumeResponse.class, required = true, description = "the ID of the disk volume")
@@ -84,10 +82,12 @@ public class AttachVolumeCmd extends BaseAsyncCmd {
return s_name;
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Volume;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
index 0d1cf90..eb4ac88 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.volume;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -31,8 +33,6 @@ import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.storage.Snapshot;
@@ -49,7 +49,9 @@ public class CreateVolumeCmd extends BaseAsyncCreateCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the account associated with the disk volume. Must be used with the domainId parameter.")
+ @Parameter(name = ApiConstants.ACCOUNT,
+ type = CommandType.STRING,
+ description = "the account associated with the disk volume. Must be used with the domainId parameter.")
private String accountName;
@Parameter(name = ApiConstants.PROJECT_ID,
@@ -62,7 +64,7 @@ public class CreateVolumeCmd extends BaseAsyncCreateCmd {
type = CommandType.UUID,
entityType = DomainResponse.class,
description = "the domain ID associated with the disk offering. If used with the account parameter"
- + " returns the disk volume associated with the account for the specified domain.")
+ + " returns the disk volume associated with the account for the specified domain.")
private Long domainId;
@Parameter(name = ApiConstants.DISK_OFFERING_ID,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java
index 71341c5..550adb9 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.volume;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.storage.Volume;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
index 8368c10..70283ff 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.volume;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.storage.Volume;
import com.cloud.user.Account;
@@ -84,10 +84,12 @@ public class DetachVolumeCmd extends BaseAsyncCmd {
return "volume";
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Volume;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
index ad4becb..d73143a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
@@ -16,7 +16,7 @@
// under the License.
package org.apache.cloudstack.api.command.user.volume;
-import java.net.URISyntaxException;
+import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
@@ -30,8 +30,6 @@ import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.dc.DataCenter;
import com.cloud.event.EventTypes;
import com.cloud.storage.Upload;
@@ -97,10 +95,12 @@ public class ExtractVolumeCmd extends BaseAsyncCmd {
return s_name;
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Volume;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java
index 2c04888..aed0ae0 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java
@@ -44,7 +44,7 @@ public class ListResourceDetailsCmd extends BaseListProjectAndAccountResourcesCm
private String key;
@Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "if set to true, only details marked with display=true, are returned."
- + " Always false is the call is made by the regular user", since = "4.3")
+ + " Always false is the call is made by the regular user", since = "4.3")
private Boolean forDisplay;
public String getResourceId() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
index ed6085d..4ebe3bf 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.volume;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
@@ -29,7 +31,6 @@ import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
@APICommand(name = "listVolumes", description = "Lists all volumes.", responseObject = VolumeResponse.class)
public class ListVolumesCmd extends BaseListTaggedResourcesCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java
index 3d7d0c9..fa6ac69 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java
@@ -26,7 +26,6 @@ import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import com.cloud.event.EventTypes;
-import com.cloud.exception.ConcurrentOperationException;
import com.cloud.storage.Volume;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java
index 3c43523..c4c7554 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.command.user.volume;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.server.ResourceTag;
@@ -42,7 +43,11 @@ public class RemoveResourceDetailCmd extends BaseAsyncCmd {
@Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.STRING, required = true, description = "Delete detail by resource type")
private String resourceType;
- @Parameter(name = ApiConstants.RESOURCE_ID, type = CommandType.STRING, required = true, collectionType = CommandType.STRING, description = "Delete details for resource id")
+ @Parameter(name = ApiConstants.RESOURCE_ID,
+ type = CommandType.STRING,
+ required = true,
+ collectionType = CommandType.STRING,
+ description = "Delete details for resource id")
private String resourceId;
/////////////////////////////////////////////////////
@@ -70,6 +75,7 @@ public class RemoveResourceDetailCmd extends BaseAsyncCmd {
return s_name;
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Volume;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
index 6d60991..0cc8039 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.volume;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
@@ -56,7 +56,11 @@ public class ResizeVolumeCmd extends BaseAsyncCmd {
@Parameter(name = ApiConstants.SHRINK_OK, type = CommandType.BOOLEAN, required = false, description = "Verify OK to Shrink")
private boolean shrinkOk;
- @Parameter(name = ApiConstants.DISK_OFFERING_ID, entityType = DiskOfferingResponse.class, type = CommandType.UUID, required = false, description = "new disk offering id")
+ @Parameter(name = ApiConstants.DISK_OFFERING_ID,
+ entityType = DiskOfferingResponse.class,
+ type = CommandType.UUID,
+ required = false,
+ description = "new disk offering id")
private Long newDiskOfferingId;
/////////////////////////////////////////////////////
@@ -110,7 +114,8 @@ public class ResizeVolumeCmd extends BaseAsyncCmd {
if (account.getType() == Account.ACCOUNT_TYPE_PROJECT) {
Project project = _projectService.findByProjectAccountId(volume.getAccountId());
if (project.getState() != Project.State.Active) {
- throw new PermissionDeniedException("Can't add resources to project id=" + project.getId() + " in state=" + project.getState() + " as it's no longer active");
+ throw new PermissionDeniedException("Can't add resources to project id=" + project.getId() + " in state=" + project.getState() +
+ " as it's no longer active");
}
} else if (account.getState() == Account.State.disabled) {
throw new PermissionDeniedException("The owner of volume " + id + " is disabled: " + account);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
index 89cbc2c..f12cef8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.volume;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
@@ -57,7 +58,9 @@ public class UpdateVolumeCmd extends BaseAsyncCmd {
@Parameter(name = ApiConstants.STATE, type = CommandType.STRING, description = "The state of the volume", since = "4.3")
private String state;
- @Parameter(name = ApiConstants.DISPLAY_VOLUME, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the volume to the end user or not.")
+ @Parameter(name = ApiConstants.DISPLAY_VOLUME,
+ type = CommandType.BOOLEAN,
+ description = "an optional field, whether to the display the volume to the end user or not.")
private Boolean displayVolume;
/////////////////////////////////////////////////////
@@ -93,10 +96,12 @@ public class UpdateVolumeCmd extends BaseAsyncCmd {
return s_name;
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Volume;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java
index 832b34d..991cfc1 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java
@@ -16,21 +16,20 @@
// under the License.
package org.apache.cloudstack.api.command.user.volume;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.BaseCmd.CommandType;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@@ -48,7 +47,10 @@ public class UploadVolumeCmd extends BaseAsyncCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.FORMAT, type = CommandType.STRING, required = true, description = "the format for the volume. Possible values include QCOW2, OVA, and VHD.")
+ @Parameter(name = ApiConstants.FORMAT,
+ type = CommandType.STRING,
+ required = true,
+ description = "the format for the volume. Possible values include QCOW2, OVA, and VHD.")
private String format;
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "the name of the volume")
@@ -126,8 +128,8 @@ public class UploadVolumeCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException,
- NetworkRuleConflictException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException, NetworkRuleConflictException {
Volume volume = _volumeService.uploadVolume(this);
if (volume != null) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
index 19f9b5b..0aafa39 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
@@ -47,13 +47,12 @@ public class CreateVPCCmd extends BaseAsyncCreateCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the account associated with the VPC. " + "Must be used with the domainId parameter.")
+ @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the account associated with the VPC. "
+ + "Must be used with the domainId parameter.")
private String accountName;
- @Parameter(name = ApiConstants.DOMAIN_ID,
- type = CommandType.UUID,
- entityType = DomainResponse.class,
- description = "the domain ID associated with the VPC. " + "If used with the account parameter returns the VPC associated with the account for the specified domain.")
+ @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "the domain ID associated with the VPC. "
+ + "If used with the account parameter returns the VPC associated with the account for the specified domain.")
private Long domainId;
@Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "create VPC for the project")
@@ -69,10 +68,14 @@ public class CreateVPCCmd extends BaseAsyncCreateCmd {
private String displayText;
@Parameter(name = ApiConstants.CIDR, type = CommandType.STRING, required = true, description = "the cidr of the VPC. All VPC "
- + "guest networks' cidrs should be within this CIDR")
+ + "guest networks' cidrs should be within this CIDR")
private String cidr;
- @Parameter(name = ApiConstants.VPC_OFF_ID, type = CommandType.UUID, entityType = VpcOfferingResponse.class, required = true, description = "the ID of the VPC offering")
+ @Parameter(name = ApiConstants.VPC_OFF_ID,
+ type = CommandType.UUID,
+ entityType = VpcOfferingResponse.class,
+ required = true,
+ description = "the ID of the VPC offering")
private Long vpcOffering;
@Parameter(name = ApiConstants.NETWORK_DOMAIN, type = CommandType.STRING, description = "VPC network domain. All networks inside the VPC will belong to this domain")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java
index 87e5c30..937341e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vpc;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.StaticRouteResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceUnavailableException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java
index a2f20ef..14f21ba 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vpc;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.VpcResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java
index a6789fc..7870673 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.vpc;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.PrivateGatewayResponse;
import org.apache.cloudstack.api.response.VpcResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.vpc.PrivateGateway;
import com.cloud.utils.Pair;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java
index 9e35944..85051cf 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.command.user.vpc;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.VpcOfferingResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.vpc.VpcOffering;
@@ -49,7 +50,10 @@ public class ListVPCOfferingsCmd extends BaseListCmd {
@Parameter(name = ApiConstants.IS_DEFAULT, type = CommandType.BOOLEAN, description = "true if need to list only default " + "VPC offerings. Default value is false")
private Boolean isDefault;
- @Parameter(name = ApiConstants.SUPPORTED_SERVICES, type = CommandType.LIST, collectionType = CommandType.STRING, description = "list VPC offerings supporting certain services")
+ @Parameter(name = ApiConstants.SUPPORTED_SERVICES,
+ type = CommandType.LIST,
+ collectionType = CommandType.STRING,
+ description = "list VPC offerings supporting certain services")
private List<String> supportedServices;
@Parameter(name = ApiConstants.STATE, type = CommandType.STRING, description = "list VPC offerings by state")
@@ -88,8 +92,9 @@ public class ListVPCOfferingsCmd extends BaseListCmd {
@Override
public void execute() {
- List<? extends VpcOffering> offerings = _vpcProvSvc.listVpcOfferings(getId(), getVpcOffName(), getDisplayText(), getSupportedServices(), isDefault, this.getKeyword(),
- getState(), this.getStartIndex(), this.getPageSizeVal());
+ List<? extends VpcOffering> offerings =
+ _vpcProvSvc.listVpcOfferings(getId(), getVpcOffName(), getDisplayText(), getSupportedServices(), isDefault, this.getKeyword(), getState(),
+ this.getStartIndex(), this.getPageSizeVal());
ListResponse<VpcOfferingResponse> response = new ListResponse<VpcOfferingResponse>();
List<VpcOfferingResponse> offeringResponses = new ArrayList<VpcOfferingResponse>();
for (VpcOffering offering : offerings) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java
index 22ee571..45ab863 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java
@@ -19,16 +19,16 @@ package org.apache.cloudstack.api.command.user.vpc;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.VpcOfferingResponse;
import org.apache.cloudstack.api.response.VpcResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.vpc.Vpc;
@@ -52,7 +52,8 @@ public class ListVPCsCmd extends BaseListTaggedResourcesCmd {
@Parameter(name = ApiConstants.DISPLAY_TEXT, type = CommandType.STRING, description = "List by display text of " + "the VPC")
private String displayText;
- @Parameter(name = ApiConstants.CIDR, type = CommandType.STRING, description = "list by cidr of the VPC. All VPC " + "guest networks' cidrs should be within this CIDR")
+ @Parameter(name = ApiConstants.CIDR, type = CommandType.STRING, description = "list by cidr of the VPC. All VPC "
+ + "guest networks' cidrs should be within this CIDR")
private String cidr;
@Parameter(name = ApiConstants.VPC_OFF_ID, type = CommandType.UUID, entityType = VpcOfferingResponse.class, description = "list by ID of the VPC offering")
@@ -113,9 +114,10 @@ public class ListVPCsCmd extends BaseListTaggedResourcesCmd {
@Override
public void execute() {
- List<? extends Vpc> vpcs = _vpcService.listVpcs(getId(), getVpcName(), getDisplayText(), getSupportedServices(), getCidr(), getVpcOffId(), getState(), getAccountName(),
- getDomainId(), this.getKeyword(), this.getStartIndex(), this.getPageSizeVal(), getZoneId(), this.isRecursive(), this.listAll(), getRestartRequired(), getTags(),
- getProjectId());
+ List<? extends Vpc> vpcs =
+ _vpcService.listVpcs(getId(), getVpcName(), getDisplayText(), getSupportedServices(), getCidr(), getVpcOffId(), getState(), getAccountName(), getDomainId(),
+ this.getKeyword(), this.getStartIndex(), this.getPageSizeVal(), getZoneId(), this.isRecursive(), this.listAll(), getRestartRequired(), getTags(),
+ getProjectId());
ListResponse<VpcResponse> response = new ListResponse<VpcResponse>();
List<VpcResponse> offeringResponses = new ArrayList<VpcResponse>();
for (Vpc vpc : vpcs) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java
index 8b9a925..ce14451 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vpc;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.VpcResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
index 72ee1cf..7358524 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vpc;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.VpcResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.network.vpc.Vpc;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java
index a704d62..7c58117 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vpn;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.VpnUsersResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.domain.Domain;
import com.cloud.event.EventTypes;
import com.cloud.network.VpnUser;
[48/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java
index 43faa5e..56dcb4f 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.internallb;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainRouterResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@@ -89,10 +89,12 @@ public class StartInternalLBVMCmd extends BaseAsyncCmd {
return "starting internal lb vm: " + getId();
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.InternalLbVm;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java
index 33895b8..9da4db0 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.internallb;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainRouterResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InvalidParameterValueException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
index 21f7a21..7af9355 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
@@ -20,6 +20,8 @@ import java.util.Map;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -28,7 +30,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.NetworkDeviceResponse;
import org.apache.cloudstack.network.ExternalNetworkDeviceManager;
-import org.apache.log4j.Logger;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@@ -68,7 +69,8 @@ public class AddNetworkDeviceCmd extends BaseCmd {
}
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException {
try {
Host device = nwDeviceMgr.addNetworkDevice(this);
NetworkDeviceResponse response = nwDeviceMgr.getApiResponse(device);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
index 5e24da6..f190493 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.network;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -29,14 +31,15 @@ import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
import org.apache.cloudstack.api.response.ProviderResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.user.Account;
-@APICommand(name = "addNetworkServiceProvider", description = "Adds a network serviceProvider to a physical network", responseObject = ProviderResponse.class, since = "3.0.0")
+@APICommand(name = "addNetworkServiceProvider",
+ description = "Adds a network serviceProvider to a physical network",
+ responseObject = ProviderResponse.class,
+ since = "3.0.0")
public class AddNetworkServiceProviderCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(AddNetworkServiceProviderCmd.class.getName());
@@ -117,8 +120,8 @@ public class AddNetworkServiceProviderCmd extends BaseAsyncCreateCmd {
@Override
public void create() throws ResourceAllocationException {
- PhysicalNetworkServiceProvider result = _networkService.addProviderToPhysicalNetwork(getPhysicalNetworkId(), getProviderName(), getDestinationPhysicalNetworkId(),
- getEnabledServices());
+ PhysicalNetworkServiceProvider result =
+ _networkService.addProviderToPhysicalNetwork(getPhysicalNetworkId(), getProviderName(), getDestinationPhysicalNetworkId(), getEnabledServices());
if (result != null) {
setEntityId(result.getId());
setEntityUuid(result.getUuid());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
index d52013e..bdf0472 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
@@ -23,6 +23,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -31,7 +33,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.NetworkOfferingResponse;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.Network.Capability;
@@ -110,10 +111,8 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
description = "true if network offering supports persistent networks; defaulted to false if not specified")
private Boolean isPersistent;
- @Parameter(name = ApiConstants.DETAILS,
- type = CommandType.MAP,
- since = "4.2.0",
- description = "Network offering details in key/value pairs." + " Supported keys are internallbprovider/publiclbprovider with service provider as a value")
+ @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, since = "4.2.0", description = "Network offering details in key/value pairs."
+ + " Supported keys are internallbprovider/publiclbprovider with service provider as a value")
protected Map details;
@Parameter(name = ApiConstants.EGRESS_DEFAULT_POLICY,
@@ -127,7 +126,9 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
description = "if true keepalive will be turned on in the loadbalancer. At the time of writing this has only an effect on haproxy; the mode http and httpclose options are unset in the haproxy conf file.")
private Boolean keepAliveEnabled;
- @Parameter(name = ApiConstants.MAX_CONNECTIONS, type = CommandType.INTEGER, description = "maximum number of concurrent connections supported by the network offering")
+ @Parameter(name = ApiConstants.MAX_CONNECTIONS,
+ type = CommandType.INTEGER,
+ description = "maximum number of concurrent connections supported by the network offering")
private Integer maxConnections;
/////////////////////////////////////////////////////
@@ -242,9 +243,9 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
while (iter.hasNext()) {
HashMap<String, String> svcCapabilityMap = (HashMap<String, String>)iter.next();
Capability capability = null;
- String svc = (String)svcCapabilityMap.get("service");
- String capabilityName = (String)svcCapabilityMap.get("capabilitytype");
- String capabilityValue = (String)svcCapabilityMap.get("capabilityvalue");
+ String svc = svcCapabilityMap.get("service");
+ String capabilityName = svcCapabilityMap.get("capabilitytype");
+ String capabilityValue = svcCapabilityMap.get("capabilityvalue");
if (capabilityName != null) {
capability = Capability.getCapability(capabilityName);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java
index a4fe400..de4e5e5 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.network;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -30,8 +32,6 @@ import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.network.PhysicalNetwork;
@@ -47,7 +47,11 @@ public class CreatePhysicalNetworkCmd extends BaseAsyncCreateCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, required = true, description = "the Zone ID for the physical network")
+ @Parameter(name = ApiConstants.ZONE_ID,
+ type = CommandType.UUID,
+ entityType = ZoneResponse.class,
+ required = true,
+ description = "the Zone ID for the physical network")
private Long zoneId;
@Parameter(name = ApiConstants.VLAN, type = CommandType.STRING, description = "the VLAN for the physical network")
@@ -56,7 +60,10 @@ public class CreatePhysicalNetworkCmd extends BaseAsyncCreateCmd {
@Parameter(name = ApiConstants.NETWORK_SPEED, type = CommandType.STRING, description = "the speed for the physical network[1G/10G]")
private String speed;
- @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "domain ID of the account owning a physical network")
+ @Parameter(name = ApiConstants.DOMAIN_ID,
+ type = CommandType.UUID,
+ entityType = DomainResponse.class,
+ description = "domain ID of the account owning a physical network")
private Long domainId;
@Parameter(name = ApiConstants.BROADCAST_DOMAIN_RANGE,
@@ -161,8 +168,9 @@ public class CreatePhysicalNetworkCmd extends BaseAsyncCreateCmd {
@Override
public void create() throws ResourceAllocationException {
- PhysicalNetwork result = _networkService.createPhysicalNetwork(getZoneId(), getVlan(), getNetworkSpeed(), getIsolationMethods(), getBroadcastDomainRange(), getDomainId(),
- getTags(), getNetworkName());
+ PhysicalNetwork result =
+ _networkService.createPhysicalNetwork(getZoneId(), getVlan(), getNetworkSpeed(), getIsolationMethods(), getBroadcastDomainRange(), getDomainId(), getTags(),
+ getNetworkName());
if (result != null) {
setEntityId(result.getId());
setEntityUuid(result.getUuid());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java
index 9f89712..cfbbd36 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.network;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.StorageNetworkIpRangeResponse;
-import org.apache.log4j.Logger;
import com.cloud.dc.StorageNetworkIpRange;
import com.cloud.event.EventTypes;
@@ -34,7 +35,10 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
-@APICommand(name = "createStorageNetworkIpRange", description = "Creates a Storage network IP range.", responseObject = StorageNetworkIpRangeResponse.class, since = "3.0.0")
+@APICommand(name = "createStorageNetworkIpRange",
+ description = "Creates a Storage network IP range.",
+ responseObject = StorageNetworkIpRangeResponse.class,
+ since = "3.0.0")
public class CreateStorageNetworkIpRangeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(CreateStorageNetworkIpRangeCmd.class);
@@ -43,7 +47,11 @@ public class CreateStorageNetworkIpRangeCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.POD_ID, type = CommandType.UUID, entityType = PodResponse.class, required = true, description = "UUID of pod where the ip range belongs to")
+ @Parameter(name = ApiConstants.POD_ID,
+ type = CommandType.UUID,
+ entityType = PodResponse.class,
+ required = true,
+ description = "UUID of pod where the ip range belongs to")
private Long podId;
@Parameter(name = ApiConstants.START_IP, type = CommandType.STRING, required = true, description = "the beginning IP address")
@@ -102,7 +110,8 @@ public class CreateStorageNetworkIpRangeCmd extends BaseAsyncCmd {
}
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException {
try {
StorageNetworkIpRange result = _storageNetworkService.createIpRange(this);
StorageNetworkIpRangeResponse response = _responseGenerator.createStorageNetworkIpRangeResponse(result);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java
index e40a319..51b4924 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java
@@ -18,10 +18,8 @@
*/
package org.apache.cloudstack.api.command.admin.network;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.GuestVlan;
-import com.cloud.user.Account;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -32,7 +30,11 @@ import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.GuestVlanRangeResponse;
import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
-import org.apache.log4j.Logger;
+
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.GuestVlan;
+import com.cloud.user.Account;
@APICommand(name = "dedicateGuestVlanRange", description = "Dedicates a guest vlan range to an account", responseObject = GuestVlanRangeResponse.class)
public class DedicateGuestVlanRangeCmd extends BaseCmd {
@@ -53,7 +55,11 @@ public class DedicateGuestVlanRangeCmd extends BaseCmd {
@Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "project who will own the VLAN")
private Long projectId;
- @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, required = true, description = "domain ID of the account owning a VLAN")
+ @Parameter(name = ApiConstants.DOMAIN_ID,
+ type = CommandType.UUID,
+ entityType = DomainResponse.class,
+ required = true,
+ description = "domain ID of the account owning a VLAN")
private Long domainId;
@Parameter(name = ApiConstants.PHYSICAL_NETWORK_ID,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java
index 867b4bf..96e4fa5 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.network;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,7 +29,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.network.ExternalNetworkDeviceManager;
-import org.apache.log4j.Logger;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@@ -56,7 +57,8 @@ public class DeleteNetworkDeviceCmd extends BaseCmd {
}
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException {
try {
boolean result = nwDeviceMgr.deleteNetworkDevice(this);
if (result) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java
index 212e543..3aa7d66 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.network;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.NetworkOfferingResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
@@ -37,7 +38,11 @@ public class DeleteNetworkOfferingCmd extends BaseCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = NetworkOfferingResponse.class, required = true, description = "the ID of the network offering")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = NetworkOfferingResponse.class,
+ required = true,
+ description = "the ID of the network offering")
private Long id;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java
index a83ffab..c4993c3 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.network;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -25,7 +27,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ProviderResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
@@ -42,7 +43,11 @@ public class DeleteNetworkServiceProviderCmd extends BaseAsyncCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ProviderResponse.class, required = true, description = "the ID of the network service provider")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = ProviderResponse.class,
+ required = true,
+ description = "the ID of the network service provider")
private Long id;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java
index 0f61af4..828683a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.network;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
@@ -41,7 +41,11 @@ public class DeletePhysicalNetworkCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = PhysicalNetworkResponse.class, required = true, description = "the ID of the Physical network")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = PhysicalNetworkResponse.class,
+ required = true,
+ description = "the ID of the Physical network")
private Long id;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java
index 8742474..42c9619 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.network;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.StorageNetworkIpRangeResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
@@ -69,7 +70,8 @@ public class DeleteStorageNetworkIpRangeCmd extends BaseAsyncCmd {
}
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException {
try {
_storageNetworkService.deleteIpRange(this);
SuccessResponse response = new SuccessResponse(getCommandName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java
index 13519e3..ca7c1f7 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java
@@ -16,15 +16,25 @@
// under the License.
package org.apache.cloudstack.api.command.admin.network;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseListCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.response.DomainResponse;
+import org.apache.cloudstack.api.response.GuestVlanRangeResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
+import org.apache.cloudstack.api.response.ProjectResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
+
import com.cloud.network.GuestVlan;
import com.cloud.user.Account;
import com.cloud.utils.Pair;
-import org.apache.cloudstack.api.*;
-import org.apache.cloudstack.api.response.*;
-import org.apache.log4j.Logger;
-
-import java.util.ArrayList;
-import java.util.List;
@APICommand(name = "listDedicatedGuestVlanRanges", description = "Lists dedicated guest vlan ranges", responseObject = GuestVlanRangeResponse.class)
public class ListDedicatedGuestVlanRangesCmd extends BaseListCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java
index b3a0002..de175d0 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java
@@ -22,6 +22,8 @@ import java.util.Map;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -31,7 +33,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.NetworkDeviceResponse;
import org.apache.cloudstack.network.ExternalNetworkDeviceManager;
-import org.apache.log4j.Logger;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@@ -69,7 +70,8 @@ public class ListNetworkDeviceCmd extends BaseListCmd {
}
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException {
try {
List<Host> devices = nwDeviceMgr.listNetworkDevice(this);
List<NetworkDeviceResponse> nwdeviceResponses = new ArrayList<NetworkDeviceResponse>();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java
index 300e638..d30f7b8 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java
@@ -26,7 +26,10 @@ import org.apache.cloudstack.api.response.ListResponse;
import com.cloud.network.Networks;
-@APICommand(name = "listNetworkIsolationMethods", description = "Lists supported methods of network isolation", responseObject = IsolationMethodResponse.class, since = "4.2.0")
+@APICommand(name = "listNetworkIsolationMethods",
+ description = "Lists supported methods of network isolation",
+ responseObject = IsolationMethodResponse.class,
+ since = "4.2.0")
public class ListNetworkIsolationMethodsCmd extends BaseListCmd {
private static final String s_name = "listnetworkisolationmethodsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java
index 2918f90..25d5d0f 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.network;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
import org.apache.cloudstack.api.response.ProviderResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.user.Account;
@@ -88,8 +89,8 @@ public class ListNetworkServiceProvidersCmd extends BaseListCmd {
@Override
public void execute() {
- Pair<List<? extends PhysicalNetworkServiceProvider>, Integer> serviceProviders = _networkService.listNetworkServiceProviders(getPhysicalNetworkId(), getName(), getState(),
- this.getStartIndex(), this.getPageSizeVal());
+ Pair<List<? extends PhysicalNetworkServiceProvider>, Integer> serviceProviders =
+ _networkService.listNetworkServiceProviders(getPhysicalNetworkId(), getName(), getState(), this.getStartIndex(), this.getPageSizeVal());
ListResponse<ProviderResponse> response = new ListResponse<ProviderResponse>();
List<ProviderResponse> serviceProvidersResponses = new ArrayList<ProviderResponse>();
for (PhysicalNetworkServiceProvider serviceProvider : serviceProviders.first()) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java
index 4ef47fd..3ac2faa 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.network;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -28,7 +30,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.PhysicalNetwork;
import com.cloud.user.Account;
@@ -85,8 +86,8 @@ public class ListPhysicalNetworksCmd extends BaseListCmd {
@Override
public void execute() {
- Pair<List<? extends PhysicalNetwork>, Integer> result = _networkService.searchPhysicalNetworks(getId(), getZoneId(), this.getKeyword(), this.getStartIndex(),
- this.getPageSizeVal(), getNetworkName());
+ Pair<List<? extends PhysicalNetwork>, Integer> result =
+ _networkService.searchPhysicalNetworks(getId(), getZoneId(), this.getKeyword(), this.getStartIndex(), this.getPageSizeVal(), getNetworkName());
if (result != null) {
ListResponse<PhysicalNetworkResponse> response = new ListResponse<PhysicalNetworkResponse>();
List<PhysicalNetworkResponse> networkResponses = new ArrayList<PhysicalNetworkResponse>();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
index fc0c157..0b17666 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.network;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -29,7 +31,6 @@ import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.StorageNetworkIpRangeResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.dc.StorageNetworkIpRange;
import com.cloud.exception.ConcurrentOperationException;
@@ -83,7 +84,8 @@ public class ListStorageNetworkIpRangeCmd extends BaseListCmd {
}
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException {
try {
List<StorageNetworkIpRange> results = _storageNetworkService.listIpRange(this);
ListResponse<StorageNetworkIpRangeResponse> response = new ListResponse<StorageNetworkIpRangeResponse>();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java
index 8a8d1eb..240c033 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.command.admin.network;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ServiceResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.Network;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java
index cb379a0..43e1149 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java
@@ -17,17 +17,21 @@
package org.apache.cloudstack.api.command.admin.network;
-import com.cloud.event.EventTypes;
-import com.cloud.exception.ResourceInUseException;
-import com.cloud.user.Account;
+import org.apache.log4j.Logger;
-import org.apache.cloudstack.api.*;
-import org.apache.cloudstack.api.response.CounterResponse;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandJobType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.GuestVlanRangeResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
+import com.cloud.event.EventTypes;
+import com.cloud.user.Account;
@APICommand(name = "releaseDedicatedGuestVlanRange", description = "Releases a dedicated guest vlan range to the system", responseObject = SuccessResponse.class)
public class ReleaseDedicatedGuestVlanRangeCmd extends BaseAsyncCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
index 40d474a..aaff5a1 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.network;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.NetworkOfferingResponse;
-import org.apache.log4j.Logger;
import com.cloud.offering.NetworkOffering;
import com.cloud.user.Account;
@@ -46,9 +47,8 @@ public class UpdateNetworkOfferingCmd extends BaseCmd {
@Parameter(name = ApiConstants.DISPLAY_TEXT, type = CommandType.STRING, description = "the display text of the network offering")
private String displayText;
- @Parameter(name = ApiConstants.AVAILABILITY,
- type = CommandType.STRING,
- description = "the availability of network offering." + " Default value is Required for Guest Virtual network offering; Optional for Guest Direct network offering")
+ @Parameter(name = ApiConstants.AVAILABILITY, type = CommandType.STRING, description = "the availability of network offering."
+ + " Default value is Required for Guest Virtual network offering; Optional for Guest Direct network offering")
private String availability;
@Parameter(name = ApiConstants.SORT_KEY, type = CommandType.INTEGER, description = "sort key of the network offering, integer")
@@ -63,7 +63,9 @@ public class UpdateNetworkOfferingCmd extends BaseCmd {
description = "if true keepalive will be turned on in the loadbalancer. At the time of writing this has only an effect on haproxy; the mode http and httpclose options are unset in the haproxy conf file.")
private Boolean keepAliveEnabled;
- @Parameter(name = ApiConstants.MAX_CONNECTIONS, type = CommandType.INTEGER, description = "maximum number of concurrent connections supported by the network offering")
+ @Parameter(name = ApiConstants.MAX_CONNECTIONS,
+ type = CommandType.INTEGER,
+ description = "maximum number of concurrent connections supported by the network offering")
private Integer maxConnections;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java
index b22501d..c530c53 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.network;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ProviderResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.network.PhysicalNetworkServiceProvider;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java
index 3ab9f3f..f808424 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.command.admin.network;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.network.PhysicalNetwork;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java
index b57099e..9fd084a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.network;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.StorageNetworkIpRangeResponse;
-import org.apache.log4j.Logger;
import com.cloud.dc.StorageNetworkIpRange;
import com.cloud.event.EventTypes;
@@ -44,7 +45,11 @@ public class UpdateStorageNetworkIpRangeCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = StorageNetworkIpRangeResponse.class, required = true, description = "UUID of storage network ip range")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = StorageNetworkIpRangeResponse.class,
+ required = true,
+ description = "UUID of storage network ip range")
private Long id;
@Parameter(name = ApiConstants.START_IP, type = CommandType.STRING, description = "the beginning IP address")
@@ -93,7 +98,8 @@ public class UpdateStorageNetworkIpRangeCmd extends BaseAsyncCmd {
}
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException {
try {
StorageNetworkIpRange result = _storageNetworkService.updateIpRange(this);
StorageNetworkIpRangeResponse response = _responseGenerator.createStorageNetworkIpRangeResponse(result);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
index d864073..1d959a0 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.offering;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.cloudstack.api.response.DomainResponse;
-import org.apache.log4j.Logger;
import com.cloud.offering.DiskOffering;
import com.cloud.offering.ServiceOffering;
@@ -64,7 +65,9 @@ public class CreateDiskOfferingCmd extends BaseCmd {
@Parameter(name = ApiConstants.STORAGE_TYPE, type = CommandType.STRING, description = "the storage type of the disk offering. Values are local and shared.")
private String storageType = ServiceOffering.StorageType.shared.toString();
- @Parameter(name = ApiConstants.DISPLAY_OFFERING, type = CommandType.BOOLEAN, description = "an optional field, whether to display the offering to the end user or not.")
+ @Parameter(name = ApiConstants.DISPLAY_OFFERING,
+ type = CommandType.BOOLEAN,
+ description = "an optional field, whether to display the offering to the end user or not.")
private Boolean displayOffering;
@Parameter(name = ApiConstants.BYTES_READ_RATE, type = CommandType.LONG, required = false, description = "bytes read rate of the disk offering")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
index 82f338f..7dd87e1 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.offering;
import java.util.Collection;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,7 +29,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
-import org.apache.log4j.Logger;
import com.cloud.offering.ServiceOffering;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java
index 2afdbe8..9845aa4 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.offering;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
@@ -52,6 +53,7 @@ public class DeleteDiskOfferingCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
+ @Override
public String getCommandName() {
return s_name;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java
index a1ad264..0f81409 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.offering;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
@@ -37,7 +38,11 @@ public class DeleteServiceOfferingCmd extends BaseCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ServiceOfferingResponse.class, required = true, description = "the ID of the service offering")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = ServiceOfferingResponse.class,
+ required = true,
+ description = "the ID of the service offering")
private Long id;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java
index 53e0b5c..6d45fb5 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.offering;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DiskOfferingResponse;
-import org.apache.log4j.Logger;
import com.cloud.offering.DiskOffering;
import com.cloud.user.Account;
@@ -37,7 +38,10 @@ public class UpdateDiskOfferingCmd extends BaseCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.DISPLAY_TEXT, type = CommandType.STRING, description = "updates alternate display text of the disk offering with this value", length = 4096)
+ @Parameter(name = ApiConstants.DISPLAY_TEXT,
+ type = CommandType.STRING,
+ description = "updates alternate display text of the disk offering with this value",
+ length = 4096)
private String displayText;
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = DiskOfferingResponse.class, required = true, description = "ID of the disk offering")
@@ -49,7 +53,9 @@ public class UpdateDiskOfferingCmd extends BaseCmd {
@Parameter(name = ApiConstants.SORT_KEY, type = CommandType.INTEGER, description = "sort key of the disk offering, integer")
private Integer sortKey;
- @Parameter(name = ApiConstants.DISPLAY_OFFERING, type = CommandType.BOOLEAN, description = "an optional field, whether to display the offering to the end user or not.")
+ @Parameter(name = ApiConstants.DISPLAY_OFFERING,
+ type = CommandType.BOOLEAN,
+ description = "an optional field, whether to display the offering to the end user or not.")
private Boolean displayOffering;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
index fae0b94..fbc8845 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.offering;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
-import org.apache.log4j.Logger;
import com.cloud.offering.ServiceOffering;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java
index f34d12a..835a3b9 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.pod;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.dc.Pod;
import com.cloud.user.Account;
@@ -41,7 +42,11 @@ public class CreatePodCmd extends BaseCmd {
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "the name of the Pod")
private String podName;
- @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, required = true, description = "the Zone ID in which the Pod will be created")
+ @Parameter(name = ApiConstants.ZONE_ID,
+ type = CommandType.UUID,
+ entityType = ZoneResponse.class,
+ required = true,
+ description = "the Zone ID in which the Pod will be created")
private Long zoneId;
@Parameter(name = ApiConstants.START_IP, type = CommandType.STRING, required = true, description = "the starting IP address for the Pod")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java
index 584ac05..584eed4 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.pod;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
@@ -53,6 +54,7 @@ public class DeletePodCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
+ @Override
public String getCommandName() {
return s_name;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
index d7511ae..75b5efd 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.pod;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.dc.Pod;
import com.cloud.utils.Pair;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java
index 79114c6..7b8f6eb 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.pod;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.PodResponse;
-import org.apache.log4j.Logger;
import com.cloud.dc.Pod;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java
index f6b623d..9e7c035 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.region;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,7 +29,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.RegionResponse;
import org.apache.cloudstack.region.Region;
import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java
index d9b16ee..e900f47 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java
@@ -17,13 +17,8 @@
package org.apache.cloudstack.api.command.admin.region;
-import javax.inject.Inject;
+import org.apache.log4j.Logger;
-import com.cloud.dc.Vlan;
-import com.cloud.event.EventTypes;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceAllocationException;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -33,15 +28,17 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.PortableIpRangeResponse;
import org.apache.cloudstack.api.response.RegionResponse;
-import org.apache.cloudstack.api.response.VlanIpRangeResponse;
import org.apache.cloudstack.region.PortableIpRange;
-import org.apache.cloudstack.region.Region;
-import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.ResourceAllocationException;
import com.cloud.user.Account;
-@APICommand(name = "createPortableIpRange", responseObject = PortableIpRangeResponse.class, description = "adds a range of portable public IP's to a region", since = "4.2.0")
+@APICommand(name = "createPortableIpRange",
+ responseObject = PortableIpRangeResponse.class,
+ description = "adds a range of portable public IP's to a region",
+ since = "4.2.0")
public class CreatePortableIpRangeCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreatePortableIpRangeCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java
index f820260..5408eda 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java
@@ -17,17 +17,19 @@
package org.apache.cloudstack.api.command.admin.region;
-import javax.inject.Inject;
+import org.apache.log4j.Logger;
-import com.cloud.event.EventTypes;
-import org.apache.cloudstack.api.*;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandJobType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.PortableIpRangeResponse;
-import org.apache.cloudstack.api.response.RegionResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.cloudstack.region.Region;
-import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
+import com.cloud.event.EventTypes;
import com.cloud.user.Account;
@APICommand(name = "deletePortableIpRange", description = "deletes a range of portable public IP's associated with a region", responseObject = SuccessResponse.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java
index 3ca6214..42a92e6 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java
@@ -16,24 +16,23 @@
// under the License.
package org.apache.cloudstack.api.command.admin.region;
-import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
-import org.apache.cloudstack.api.*;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseListCmd;
+import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.PortableIpRangeResponse;
import org.apache.cloudstack.api.response.PortableIpResponse;
-import org.apache.cloudstack.api.response.RegionResponse;
import org.apache.cloudstack.region.PortableIp;
import org.apache.cloudstack.region.PortableIpRange;
-import org.apache.cloudstack.region.Region;
-import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
-import java.util.ArrayList;
-import java.util.List;
-
@APICommand(name = "listPortableIpRanges", description = "list portable IP ranges", responseObject = PortableIpRangeResponse.class)
public class ListPortableIpRangesCmd extends BaseListCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java
index 7951745..e912659 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.region;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java
index 4d16255..527e142 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.region;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,7 +29,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.RegionResponse;
import org.apache.cloudstack.region.Region;
import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java
index 1b9fa4d..b1177b9 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.resource;
import java.util.Date;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,7 +29,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.AlertResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.Account;
@@ -43,17 +44,19 @@ public class ArchiveAlertsCmd extends BaseCmd {
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = AlertResponse.class, description = "the IDs of the alerts")
+ @Parameter(name = ApiConstants.IDS,
+ type = CommandType.LIST,
+ collectionType = CommandType.UUID,
+ entityType = AlertResponse.class,
+ description = "the IDs of the alerts")
private List<Long> ids;
- @Parameter(name = ApiConstants.END_DATE,
- type = CommandType.DATE,
- description = "end date range to archive alerts" + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")")
+ @Parameter(name = ApiConstants.END_DATE, type = CommandType.DATE, description = "end date range to archive alerts"
+ + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")")
private Date endDate;
- @Parameter(name = ApiConstants.START_DATE,
- type = CommandType.DATE,
- description = "start date range to archive alerts" + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")")
+ @Parameter(name = ApiConstants.START_DATE, type = CommandType.DATE, description = "start date range to archive alerts"
+ + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")")
private Date startDate;
@Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, description = "archive by alert type")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java
index d4bae93..edc3bcf 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java
@@ -16,13 +16,15 @@
// under the License.
package org.apache.cloudstack.api.command.admin.resource;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import org.apache.cloudstack.context.CallContext;
+
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java
index d496481..8ba2525 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.resource;
import java.util.Date;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,7 +29,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.AlertResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.Account;
@@ -43,17 +44,19 @@ public class DeleteAlertsCmd extends BaseCmd {
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = AlertResponse.class, description = "the IDs of the alerts")
+ @Parameter(name = ApiConstants.IDS,
+ type = CommandType.LIST,
+ collectionType = CommandType.UUID,
+ entityType = AlertResponse.class,
+ description = "the IDs of the alerts")
private List<Long> ids;
- @Parameter(name = ApiConstants.END_DATE,
- type = CommandType.DATE,
- description = "end date range to delete alerts" + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")")
+ @Parameter(name = ApiConstants.END_DATE, type = CommandType.DATE, description = "end date range to delete alerts"
+ + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")")
private Date endDate;
- @Parameter(name = ApiConstants.START_DATE,
- type = CommandType.DATE,
- description = "start date range to delete alerts" + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")")
+ @Parameter(name = ApiConstants.START_DATE, type = CommandType.DATE, description = "start date range to delete alerts"
+ + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")")
private Date startDate;
@Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, description = "delete by alert type")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
index 8251efa..90ab67c 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.command.admin.resource;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.AlertResponse;
import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.log4j.Logger;
import com.cloud.alert.Alert;
import com.cloud.utils.Pair;
[32/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponse.java b/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponse.java
index 3da7a6c..b01ddd3 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponse.java
@@ -98,7 +98,8 @@ public class CreateVpnGatewayResponse implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateVpnGatewayResponse implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponseType.java b/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponseType.java
index e815e10..ff60d4e 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponseType.java
@@ -125,7 +125,8 @@ public class CreateVpnGatewayResponseType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class CreateVpnGatewayResponseType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java b/awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java
index 333d4bf..d6ed079 100644
--- a/awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java
@@ -139,7 +139,8 @@ public class CreateVpnGatewayType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -252,9 +253,8 @@ public class CreateVpnGatewayType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetItemType.java b/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetItemType.java
index 4ec5205..62471c8 100644
--- a/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetItemType.java
@@ -101,7 +101,8 @@ public class CustomerGatewayIdSetItemType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class CustomerGatewayIdSetItemType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetType.java b/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetType.java
index 5fa28dd..a576181 100644
--- a/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetType.java
@@ -142,7 +142,8 @@ public class CustomerGatewayIdSetType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class CustomerGatewayIdSetType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CustomerGatewaySetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CustomerGatewaySetType.java b/awsapi/src/com/amazon/ec2/CustomerGatewaySetType.java
index b88e2d6..398f3a4 100644
--- a/awsapi/src/com/amazon/ec2/CustomerGatewaySetType.java
+++ b/awsapi/src/com/amazon/ec2/CustomerGatewaySetType.java
@@ -142,7 +142,8 @@ public class CustomerGatewaySetType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class CustomerGatewaySetType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,8 +463,8 @@ public class CustomerGatewaySetType implements org.apache.axis2.databinding.ADBB
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.CustomerGatewayType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.CustomerGatewayType.class,
- list1));
+ object.setItem((com.amazon.ec2.CustomerGatewayType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+ com.amazon.ec2.CustomerGatewayType.class, list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CustomerGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CustomerGatewayType.java b/awsapi/src/com/amazon/ec2/CustomerGatewayType.java
index 482f46a..ffc435e 100644
--- a/awsapi/src/com/amazon/ec2/CustomerGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/CustomerGatewayType.java
@@ -250,7 +250,8 @@ public class CustomerGatewayType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -462,9 +463,8 @@ public class CustomerGatewayType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeactivateLicense.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeactivateLicense.java b/awsapi/src/com/amazon/ec2/DeactivateLicense.java
index 281c845..5758869 100644
--- a/awsapi/src/com/amazon/ec2/DeactivateLicense.java
+++ b/awsapi/src/com/amazon/ec2/DeactivateLicense.java
@@ -98,7 +98,8 @@ public class DeactivateLicense implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeactivateLicense implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeactivateLicense implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeactivateLicense").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeactivateLicense").equals(reader.getName())) {
object.setDeactivateLicense(com.amazon.ec2.DeactivateLicenseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeactivateLicenseResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeactivateLicenseResponse.java b/awsapi/src/com/amazon/ec2/DeactivateLicenseResponse.java
index 58b39a7..51a59da 100644
--- a/awsapi/src/com/amazon/ec2/DeactivateLicenseResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeactivateLicenseResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DeactivateLicenseResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeactivateLicenseResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME =
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeactivateLicenseResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DeactivateLicenseResponse implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DeactivateLicenseResponse implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeactivateLicenseResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeactivateLicenseResponseType.java b/awsapi/src/com/amazon/ec2/DeactivateLicenseResponseType.java
index 0fc5a0b..3b48c1a 100644
--- a/awsapi/src/com/amazon/ec2/DeactivateLicenseResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeactivateLicenseResponseType.java
@@ -125,7 +125,8 @@ public class DeactivateLicenseResponseType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeactivateLicenseResponseType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeactivateLicenseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeactivateLicenseType.java b/awsapi/src/com/amazon/ec2/DeactivateLicenseType.java
index ffad30e..b1a7279 100644
--- a/awsapi/src/com/amazon/ec2/DeactivateLicenseType.java
+++ b/awsapi/src/com/amazon/ec2/DeactivateLicenseType.java
@@ -125,7 +125,8 @@ public class DeactivateLicenseType implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeactivateLicenseType implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteCustomerGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteCustomerGateway.java b/awsapi/src/com/amazon/ec2/DeleteCustomerGateway.java
index 6a497e6..d72bd8e 100644
--- a/awsapi/src/com/amazon/ec2/DeleteCustomerGateway.java
+++ b/awsapi/src/com/amazon/ec2/DeleteCustomerGateway.java
@@ -98,7 +98,8 @@ public class DeleteCustomerGateway implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteCustomerGateway implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeleteCustomerGateway implements org.apache.axis2.databinding.ADBBe
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteCustomerGateway").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteCustomerGateway").equals(reader.getName())) {
object.setDeleteCustomerGateway(com.amazon.ec2.DeleteCustomerGatewayType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponse.java b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponse.java
index 11e4ba5..8bf9079 100644
--- a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DeleteCustomerGatewayResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteCustomerGatewayResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteCustomerGatewayResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DeleteCustomerGatewayResponse implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DeleteCustomerGatewayResponse implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponseType.java b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponseType.java
index 0871b7c..0deed54 100644
--- a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponseType.java
@@ -125,7 +125,8 @@ public class DeleteCustomerGatewayResponseType implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeleteCustomerGatewayResponseType implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayType.java b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayType.java
index 7cc457e..ae805e1 100644
--- a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayType.java
@@ -101,7 +101,8 @@ public class DeleteCustomerGatewayType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DeleteCustomerGatewayType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java b/awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java
index a9fe815..c3b55a2 100644
--- a/awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java
+++ b/awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java
@@ -98,7 +98,8 @@ public class DeleteDhcpOptions implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteDhcpOptions implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeleteDhcpOptions implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteDhcpOptions").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteDhcpOptions").equals(reader.getName())) {
object.setDeleteDhcpOptions(com.amazon.ec2.DeleteDhcpOptionsType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponse.java b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponse.java
index 7553aae..6c09db6 100644
--- a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DeleteDhcpOptionsResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteDhcpOptionsResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME =
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteDhcpOptionsResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DeleteDhcpOptionsResponse implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DeleteDhcpOptionsResponse implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponseType.java b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponseType.java
index 3708642..7314a5c 100644
--- a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponseType.java
@@ -125,7 +125,8 @@ public class DeleteDhcpOptionsResponseType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeleteDhcpOptionsResponseType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsType.java b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsType.java
index 61aa847..eb12869 100644
--- a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsType.java
@@ -101,7 +101,8 @@ public class DeleteDhcpOptionsType implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DeleteDhcpOptionsType implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteInternetGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteInternetGateway.java b/awsapi/src/com/amazon/ec2/DeleteInternetGateway.java
index e631842..e153cc1 100644
--- a/awsapi/src/com/amazon/ec2/DeleteInternetGateway.java
+++ b/awsapi/src/com/amazon/ec2/DeleteInternetGateway.java
@@ -98,7 +98,8 @@ public class DeleteInternetGateway implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteInternetGateway implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeleteInternetGateway implements org.apache.axis2.databinding.ADBBe
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteInternetGateway").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteInternetGateway").equals(reader.getName())) {
object.setDeleteInternetGateway(com.amazon.ec2.DeleteInternetGatewayType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponse.java b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponse.java
index ee736d4..38c6f00 100644
--- a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DeleteInternetGatewayResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteInternetGatewayResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteInternetGatewayResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DeleteInternetGatewayResponse implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DeleteInternetGatewayResponse implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponseType.java b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponseType.java
index 3b45fcd..9b641cf 100644
--- a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponseType.java
@@ -125,7 +125,8 @@ public class DeleteInternetGatewayResponseType implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeleteInternetGatewayResponseType implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayType.java b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayType.java
index c06a263..e96813e 100644
--- a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayType.java
@@ -101,7 +101,8 @@ public class DeleteInternetGatewayType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DeleteInternetGatewayType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteKeyPair.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteKeyPair.java b/awsapi/src/com/amazon/ec2/DeleteKeyPair.java
index e6c8810..faad15e 100644
--- a/awsapi/src/com/amazon/ec2/DeleteKeyPair.java
+++ b/awsapi/src/com/amazon/ec2/DeleteKeyPair.java
@@ -98,7 +98,8 @@ public class DeleteKeyPair implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteKeyPair implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeleteKeyPair implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteKeyPair").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteKeyPair").equals(reader.getName())) {
object.setDeleteKeyPair(com.amazon.ec2.DeleteKeyPairType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteKeyPairResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteKeyPairResponse.java b/awsapi/src/com/amazon/ec2/DeleteKeyPairResponse.java
index 8106036..4bf2d4e 100644
--- a/awsapi/src/com/amazon/ec2/DeleteKeyPairResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteKeyPairResponse.java
@@ -98,7 +98,8 @@ public class DeleteKeyPairResponse implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteKeyPairResponse implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeleteKeyPairResponse implements org.apache.axis2.databinding.ADBBe
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteKeyPairResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteKeyPairResponse").equals(reader.getName())) {
object.setDeleteKeyPairResponse(com.amazon.ec2.DeleteKeyPairResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteKeyPairResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteKeyPairResponseType.java b/awsapi/src/com/amazon/ec2/DeleteKeyPairResponseType.java
index 4597f65..613e5ba 100644
--- a/awsapi/src/com/amazon/ec2/DeleteKeyPairResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteKeyPairResponseType.java
@@ -125,7 +125,8 @@ public class DeleteKeyPairResponseType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeleteKeyPairResponseType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteKeyPairType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteKeyPairType.java b/awsapi/src/com/amazon/ec2/DeleteKeyPairType.java
index d5df2a8..e39b619 100644
--- a/awsapi/src/com/amazon/ec2/DeleteKeyPairType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteKeyPairType.java
@@ -101,7 +101,8 @@ public class DeleteKeyPairType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DeleteKeyPairType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java
index 5f9f975..255bd52 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java
@@ -98,7 +98,8 @@ public class DeleteNetworkAcl implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteNetworkAcl implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeleteNetworkAcl implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkAcl").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkAcl").equals(reader.getName())) {
object.setDeleteNetworkAcl(com.amazon.ec2.DeleteNetworkAclType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntry.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntry.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntry.java
index cb16bca..1fd877a 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntry.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntry.java
@@ -98,7 +98,8 @@ public class DeleteNetworkAclEntry implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteNetworkAclEntry implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeleteNetworkAclEntry implements org.apache.axis2.databinding.ADBBe
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkAclEntry").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkAclEntry").equals(reader.getName())) {
object.setDeleteNetworkAclEntry(com.amazon.ec2.DeleteNetworkAclEntryType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponse.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponse.java
index fdb93c6..a10c82c 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DeleteNetworkAclEntryResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkAclEntryResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkAclEntryResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DeleteNetworkAclEntryResponse implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DeleteNetworkAclEntryResponse implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponseType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponseType.java
index e5fff37..44040e8 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponseType.java
@@ -125,7 +125,8 @@ public class DeleteNetworkAclEntryResponseType implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeleteNetworkAclEntryResponseType implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryType.java
index 8ee2455..db2994b 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryType.java
@@ -149,7 +149,8 @@ public class DeleteNetworkAclEntryType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -288,9 +289,8 @@ public class DeleteNetworkAclEntryType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponse.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponse.java
index 05a4fbe..c1d6b70 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponse.java
@@ -98,7 +98,8 @@ public class DeleteNetworkAclResponse implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteNetworkAclResponse implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponseType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponseType.java
index df9cefa..9664199 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponseType.java
@@ -125,7 +125,8 @@ public class DeleteNetworkAclResponseType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeleteNetworkAclResponseType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteNetworkAclType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclType.java
index 7aeae18..94cdcf1 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclType.java
@@ -101,7 +101,8 @@ public class DeleteNetworkAclType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DeleteNetworkAclType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteNetworkInterface.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkInterface.java b/awsapi/src/com/amazon/ec2/DeleteNetworkInterface.java
index f391253..8e3829e 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkInterface.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkInterface.java
@@ -98,7 +98,8 @@ public class DeleteNetworkInterface implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteNetworkInterface implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeleteNetworkInterface implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkInterface").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkInterface").equals(reader.getName())) {
object.setDeleteNetworkInterface(com.amazon.ec2.DeleteNetworkInterfaceType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponse.java b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponse.java
index c64c4fc..d56bd47 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DeleteNetworkInterfaceResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkInterfaceResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkInterfaceResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DeleteNetworkInterfaceResponse implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DeleteNetworkInterfaceResponse implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponseType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponseType.java
index f556f5b..b8c9242 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponseType.java
@@ -125,7 +125,8 @@ public class DeleteNetworkInterfaceResponseType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeleteNetworkInterfaceResponseType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceType.java
index dc463be..5274458 100644
--- a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceType.java
@@ -101,7 +101,8 @@ public class DeleteNetworkInterfaceType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DeleteNetworkInterfaceType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
[53/54] [abbrv] Broke up some long strings
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java b/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java
index 278d11b..06ba655 100644
--- a/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java
+++ b/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java
@@ -31,9 +31,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
protected org.apache.axis2.description.AxisOperation[] _operations;
//hashmaps to keep the fault mapping
- private java.util.HashMap faultExceptionNameMap = new java.util.HashMap();
- private java.util.HashMap faultExceptionClassNameMap = new java.util.HashMap();
- private java.util.HashMap faultMessageMap = new java.util.HashMap();
+ private final java.util.HashMap faultExceptionNameMap = new java.util.HashMap();
+ private final java.util.HashMap faultExceptionClassNameMap = new java.util.HashMap();
+ private final java.util.HashMap faultMessageMap = new java.util.HashMap();
private static int counter = 0;
@@ -366,6 +366,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
_operationClient.addMessageContext(_messageContext);
_operationClient.setCallback(new org.apache.axis2.client.async.AxisCallback() {
+ @Override
public void onMessage(org.apache.axis2.context.MessageContext resultContext) {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
@@ -380,6 +381,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onError(java.lang.Exception error) {
if (error instanceof org.apache.axis2.AxisFault) {
org.apache.axis2.AxisFault f = (org.apache.axis2.AxisFault)error;
@@ -432,11 +434,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onFault(org.apache.axis2.context.MessageContext faultContext) {
org.apache.axis2.AxisFault fault = org.apache.axis2.util.Utils.getInboundFaultFromMessageContext(faultContext);
onError(fault);
}
+ @Override
public void onComplete() {
try {
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
@@ -598,6 +602,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
_operationClient.addMessageContext(_messageContext);
_operationClient.setCallback(new org.apache.axis2.client.async.AxisCallback() {
+ @Override
public void onMessage(org.apache.axis2.context.MessageContext resultContext) {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
@@ -611,6 +616,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onError(java.lang.Exception error) {
if (error instanceof org.apache.axis2.AxisFault) {
org.apache.axis2.AxisFault f = (org.apache.axis2.AxisFault)error;
@@ -663,11 +669,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onFault(org.apache.axis2.context.MessageContext faultContext) {
org.apache.axis2.AxisFault fault = org.apache.axis2.util.Utils.getInboundFaultFromMessageContext(faultContext);
onError(fault);
}
+ @Override
public void onComplete() {
try {
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
@@ -830,6 +838,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
_operationClient.addMessageContext(_messageContext);
_operationClient.setCallback(new org.apache.axis2.client.async.AxisCallback() {
+ @Override
public void onMessage(org.apache.axis2.context.MessageContext resultContext) {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
@@ -844,6 +853,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onError(java.lang.Exception error) {
if (error instanceof org.apache.axis2.AxisFault) {
org.apache.axis2.AxisFault f = (org.apache.axis2.AxisFault)error;
@@ -896,11 +906,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onFault(org.apache.axis2.context.MessageContext faultContext) {
org.apache.axis2.AxisFault fault = org.apache.axis2.util.Utils.getInboundFaultFromMessageContext(faultContext);
onError(fault);
}
+ @Override
public void onComplete() {
try {
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
@@ -1062,6 +1074,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
_operationClient.addMessageContext(_messageContext);
_operationClient.setCallback(new org.apache.axis2.client.async.AxisCallback() {
+ @Override
public void onMessage(org.apache.axis2.context.MessageContext resultContext) {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
@@ -1075,6 +1088,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onError(java.lang.Exception error) {
if (error instanceof org.apache.axis2.AxisFault) {
org.apache.axis2.AxisFault f = (org.apache.axis2.AxisFault)error;
@@ -1127,11 +1141,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onFault(org.apache.axis2.context.MessageContext faultContext) {
org.apache.axis2.AxisFault fault = org.apache.axis2.util.Utils.getInboundFaultFromMessageContext(faultContext);
onError(fault);
}
+ @Override
public void onComplete() {
try {
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
@@ -1293,6 +1309,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
_operationClient.addMessageContext(_messageContext);
_operationClient.setCallback(new org.apache.axis2.client.async.AxisCallback() {
+ @Override
public void onMessage(org.apache.axis2.context.MessageContext resultContext) {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
@@ -1306,6 +1323,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onError(java.lang.Exception error) {
if (error instanceof org.apache.axis2.AxisFault) {
org.apache.axis2.AxisFault f = (org.apache.axis2.AxisFault)error;
@@ -1358,11 +1376,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onFault(org.apache.axis2.context.MessageContext faultContext) {
org.apache.axis2.AxisFault fault = org.apache.axis2.util.Utils.getInboundFaultFromMessageContext(faultContext);
onError(fault);
}
+ @Override
public void onComplete() {
try {
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
@@ -1524,6 +1544,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
_operationClient.addMessageContext(_messageContext);
_operationClient.setCallback(new org.apache.axis2.client.async.AxisCallback() {
+ @Override
public void onMessage(org.apache.axis2.context.MessageContext resultContext) {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
@@ -1537,6 +1558,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onError(java.lang.Exception error) {
if (error instanceof org.apache.axis2.AxisFault) {
org.apache.axis2.AxisFault f = (org.apache.axis2.AxisFault)error;
@@ -1589,11 +1611,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onFault(org.apache.axis2.context.MessageContext faultContext) {
org.apache.axis2.AxisFault fault = org.apache.axis2.util.Utils.getInboundFaultFromMessageContext(faultContext);
onError(fault);
}
+ @Override
public void onComplete() {
try {
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
@@ -1755,6 +1779,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
_operationClient.addMessageContext(_messageContext);
_operationClient.setCallback(new org.apache.axis2.client.async.AxisCallback() {
+ @Override
public void onMessage(org.apache.axis2.context.MessageContext resultContext) {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
@@ -1768,6 +1793,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onError(java.lang.Exception error) {
if (error instanceof org.apache.axis2.AxisFault) {
org.apache.axis2.AxisFault f = (org.apache.axis2.AxisFault)error;
@@ -1820,11 +1846,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onFault(org.apache.axis2.context.MessageContext faultContext) {
org.apache.axis2.AxisFault fault = org.apache.axis2.util.Utils.getInboundFaultFromMessageContext(faultContext);
onError(fault);
}
+ @Override
public void onComplete() {
try {
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
@@ -1986,6 +2014,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
_operationClient.addMessageContext(_messageContext);
_operationClient.setCallback(new org.apache.axis2.client.async.AxisCallback() {
+ @Override
public void onMessage(org.apache.axis2.context.MessageContext resultContext) {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
@@ -1999,6 +2028,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onError(java.lang.Exception error) {
if (error instanceof org.apache.axis2.AxisFault) {
org.apache.axis2.AxisFault f = (org.apache.axis2.AxisFault)error;
@@ -2051,11 +2081,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onFault(org.apache.axis2.context.MessageContext faultContext) {
org.apache.axis2.AxisFault fault = org.apache.axis2.util.Utils.getInboundFaultFromMessageContext(faultContext);
onError(fault);
}
+ @Override
public void onComplete() {
try {
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
@@ -2217,6 +2249,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
_operationClient.addMessageContext(_messageContext);
_operationClient.setCallback(new org.apache.axis2.client.async.AxisCallback() {
+ @Override
public void onMessage(org.apache.axis2.context.MessageContext resultContext) {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
@@ -2230,6 +2263,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onError(java.lang.Exception error) {
if (error instanceof org.apache.axis2.AxisFault) {
org.apache.axis2.AxisFault f = (org.apache.axis2.AxisFault)error;
@@ -2282,11 +2316,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onFault(org.apache.axis2.context.MessageContext faultContext) {
org.apache.axis2.AxisFault fault = org.apache.axis2.util.Utils.getInboundFaultFromMessageContext(faultContext);
onError(fault);
}
+ @Override
public void onComplete() {
try {
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
@@ -2448,6 +2484,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
_operationClient.addMessageContext(_messageContext);
_operationClient.setCallback(new org.apache.axis2.client.async.AxisCallback() {
+ @Override
public void onMessage(org.apache.axis2.context.MessageContext resultContext) {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
@@ -2462,6 +2499,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onError(java.lang.Exception error) {
if (error instanceof org.apache.axis2.AxisFault) {
org.apache.axis2.AxisFault f = (org.apache.axis2.AxisFault)error;
@@ -2514,11 +2552,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onFault(org.apache.axis2.context.MessageContext faultContext) {
org.apache.axis2.AxisFault fault = org.apache.axis2.util.Utils.getInboundFaultFromMessageContext(faultContext);
onError(fault);
}
+ @Override
public void onComplete() {
try {
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
@@ -2681,6 +2721,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
_operationClient.addMessageContext(_messageContext);
_operationClient.setCallback(new org.apache.axis2.client.async.AxisCallback() {
+ @Override
public void onMessage(org.apache.axis2.context.MessageContext resultContext) {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
@@ -2695,6 +2736,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onError(java.lang.Exception error) {
if (error instanceof org.apache.axis2.AxisFault) {
org.apache.axis2.AxisFault f = (org.apache.axis2.AxisFault)error;
@@ -2747,11 +2789,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onFault(org.apache.axis2.context.MessageContext faultContext) {
org.apache.axis2.AxisFault fault = org.apache.axis2.util.Utils.getInboundFaultFromMessageContext(faultContext);
onError(fault);
}
+ @Override
public void onComplete() {
try {
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
@@ -2913,6 +2957,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
_operationClient.addMessageContext(_messageContext);
_operationClient.setCallback(new org.apache.axis2.client.async.AxisCallback() {
+ @Override
public void onMessage(org.apache.axis2.context.MessageContext resultContext) {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
@@ -2926,6 +2971,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onError(java.lang.Exception error) {
if (error instanceof org.apache.axis2.AxisFault) {
org.apache.axis2.AxisFault f = (org.apache.axis2.AxisFault)error;
@@ -2978,11 +3024,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onFault(org.apache.axis2.context.MessageContext faultContext) {
org.apache.axis2.AxisFault fault = org.apache.axis2.util.Utils.getInboundFaultFromMessageContext(faultContext);
onError(fault);
}
+ @Override
public void onComplete() {
try {
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
@@ -3145,6 +3193,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
_operationClient.addMessageContext(_messageContext);
_operationClient.setCallback(new org.apache.axis2.client.async.AxisCallback() {
+ @Override
public void onMessage(org.apache.axis2.context.MessageContext resultContext) {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
@@ -3159,6 +3208,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onError(java.lang.Exception error) {
if (error instanceof org.apache.axis2.AxisFault) {
org.apache.axis2.AxisFault f = (org.apache.axis2.AxisFault)error;
@@ -3211,11 +3261,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onFault(org.apache.axis2.context.MessageContext faultContext) {
org.apache.axis2.AxisFault fault = org.apache.axis2.util.Utils.getInboundFaultFromMessageContext(faultContext);
onError(fault);
}
+ @Override
public void onComplete() {
try {
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
@@ -3378,6 +3430,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
_operationClient.addMessageContext(_messageContext);
_operationClient.setCallback(new org.apache.axis2.client.async.AxisCallback() {
+ @Override
public void onMessage(org.apache.axis2.context.MessageContext resultContext) {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
@@ -3392,6 +3445,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onError(java.lang.Exception error) {
if (error instanceof org.apache.axis2.AxisFault) {
org.apache.axis2.AxisFault f = (org.apache.axis2.AxisFault)error;
@@ -3444,11 +3498,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onFault(org.apache.axis2.context.MessageContext faultContext) {
org.apache.axis2.AxisFault fault = org.apache.axis2.util.Utils.getInboundFaultFromMessageContext(faultContext);
onError(fault);
}
+ @Override
public void onComplete() {
try {
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
@@ -3610,6 +3666,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
_operationClient.addMessageContext(_messageContext);
_operationClient.setCallback(new org.apache.axis2.client.async.AxisCallback() {
+ @Override
public void onMessage(org.apache.axis2.context.MessageContext resultContext) {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
@@ -3623,6 +3680,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onError(java.lang.Exception error) {
if (error instanceof org.apache.axis2.AxisFault) {
org.apache.axis2.AxisFault f = (org.apache.axis2.AxisFault)error;
@@ -3675,11 +3733,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onFault(org.apache.axis2.context.MessageContext faultContext) {
org.apache.axis2.AxisFault fault = org.apache.axis2.util.Utils.getInboundFaultFromMessageContext(faultContext);
onError(fault);
}
+ @Override
public void onComplete() {
try {
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
@@ -3841,6 +3901,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
_operationClient.addMessageContext(_messageContext);
_operationClient.setCallback(new org.apache.axis2.client.async.AxisCallback() {
+ @Override
public void onMessage(org.apache.axis2.context.MessageContext resultContext) {
try {
org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
@@ -3854,6 +3915,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onError(java.lang.Exception error) {
if (error instanceof org.apache.axis2.AxisFault) {
org.apache.axis2.AxisFault f = (org.apache.axis2.AxisFault)error;
@@ -3906,11 +3968,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
}
+ @Override
public void onFault(org.apache.axis2.context.MessageContext faultContext) {
org.apache.axis2.AxisFault fault = org.apache.axis2.util.Utils.getInboundFaultFromMessageContext(faultContext);
onError(fault);
}
+ @Override
public void onComplete() {
try {
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
@@ -3944,7 +4008,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
return returnMap;
}
- private javax.xml.namespace.QName[] opNameArray = null;
+ private final javax.xml.namespace.QName[] opNameArray = null;
private boolean optimizeContent(javax.xml.namespace.QName opName) {
@@ -4005,7 +4069,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localAWSAccessKeyId = param;
+ localAWSAccessKeyId = param;
}
@@ -4043,7 +4107,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localTimestamp = param;
+ localTimestamp = param;
}
@@ -4081,7 +4145,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localSignature = param;
+ localSignature = param;
}
@@ -4111,6 +4175,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, MY_QNAME) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
ListAllMyBuckets.this.serialize(MY_QNAME, factory, xmlWriter);
}
@@ -4119,12 +4184,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -4406,6 +4473,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -4597,7 +4665,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setName(java.lang.String param) {
- this.localName = param;
+ localName = param;
}
@@ -4621,7 +4689,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setCreationDate(java.util.Calendar param) {
- this.localCreationDate = param;
+ localCreationDate = param;
}
@@ -4651,6 +4719,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, parentQName) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
ListAllMyBucketsEntry.this.serialize(parentQName, factory, xmlWriter);
}
@@ -4659,12 +4728,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -4912,6 +4983,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -5100,7 +5172,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localMetadata = param;
+ localMetadata = param;
}
/**
@@ -5117,7 +5189,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localMetadata);
list.add(param);
- this.localMetadata = (MetadataEntry[])list.toArray(new MetadataEntry[list.size()]);
+ localMetadata = (MetadataEntry[])list.toArray(new MetadataEntry[list.size()]);
}
@@ -5141,7 +5213,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setName(java.lang.String param) {
- this.localName = param;
+ localName = param;
}
@@ -5165,7 +5237,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setPrefix(java.lang.String param) {
- this.localPrefix = param;
+ localPrefix = param;
}
@@ -5189,7 +5261,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setMarker(java.lang.String param) {
- this.localMarker = param;
+ localMarker = param;
}
@@ -5227,7 +5299,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localNextMarker = param;
+ localNextMarker = param;
}
@@ -5251,7 +5323,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setMaxKeys(int param) {
- this.localMaxKeys = param;
+ localMaxKeys = param;
}
@@ -5289,7 +5361,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localDelimiter = param;
+ localDelimiter = param;
}
@@ -5313,7 +5385,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setIsTruncated(boolean param) {
- this.localIsTruncated = param;
+ localIsTruncated = param;
}
@@ -5361,7 +5433,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localContents = param;
+ localContents = param;
}
/**
@@ -5378,7 +5450,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localContents);
list.add(param);
- this.localContents = (ListEntry[])list.toArray(new ListEntry[list.size()]);
+ localContents = (ListEntry[])list.toArray(new ListEntry[list.size()]);
}
@@ -5426,7 +5498,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localCommonPrefixes = param;
+ localCommonPrefixes = param;
}
/**
@@ -5443,7 +5515,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localCommonPrefixes);
list.add(param);
- this.localCommonPrefixes = (PrefixEntry[])list.toArray(new PrefixEntry[list.size()]);
+ localCommonPrefixes = (PrefixEntry[])list.toArray(new PrefixEntry[list.size()]);
}
@@ -5473,6 +5545,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, parentQName) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
ListBucketResult.this.serialize(parentQName, factory, xmlWriter);
}
@@ -5481,12 +5554,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -5941,6 +6016,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -6414,7 +6490,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setBucket(java.lang.String param) {
- this.localBucket = param;
+ localBucket = param;
}
@@ -6438,7 +6514,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setKey(java.lang.String param) {
- this.localKey = param;
+ localKey = param;
}
@@ -6476,7 +6552,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localAWSAccessKeyId = param;
+ localAWSAccessKeyId = param;
}
@@ -6514,7 +6590,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localTimestamp = param;
+ localTimestamp = param;
}
@@ -6552,7 +6628,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localSignature = param;
+ localSignature = param;
}
@@ -6590,7 +6666,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localCredential = param;
+ localCredential = param;
}
@@ -6620,6 +6696,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, MY_QNAME) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
DeleteObject.this.serialize(MY_QNAME, factory, xmlWriter);
}
@@ -6628,12 +6705,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -7012,6 +7091,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -7304,7 +7384,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localBucket = param;
+ localBucket = param;
}
/**
@@ -7321,7 +7401,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localBucket);
list.add(param);
- this.localBucket = (ListAllMyBucketsEntry[])list.toArray(new ListAllMyBucketsEntry[list.size()]);
+ localBucket = (ListAllMyBucketsEntry[])list.toArray(new ListAllMyBucketsEntry[list.size()]);
}
@@ -7351,6 +7431,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, parentQName) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
ListAllMyBucketsList.this.serialize(parentQName, factory, xmlWriter);
}
@@ -7359,12 +7440,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -7565,6 +7648,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -7739,7 +7823,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setBucket(java.lang.String param) {
- this.localBucket = param;
+ localBucket = param;
}
@@ -7763,7 +7847,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setKey(java.lang.String param) {
- this.localKey = param;
+ localKey = param;
}
@@ -7815,7 +7899,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localMetadata = param;
+ localMetadata = param;
}
/**
@@ -7832,7 +7916,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localMetadata);
list.add(param);
- this.localMetadata = (MetadataEntry[])list.toArray(new MetadataEntry[list.size()]);
+ localMetadata = (MetadataEntry[])list.toArray(new MetadataEntry[list.size()]);
}
@@ -7856,7 +7940,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setData(javax.activation.DataHandler param) {
- this.localData = param;
+ localData = param;
}
@@ -7880,7 +7964,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setContentLength(long param) {
- this.localContentLength = param;
+ localContentLength = param;
}
@@ -7918,7 +8002,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localAccessControlList = param;
+ localAccessControlList = param;
}
@@ -7956,7 +8040,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localStorageClass = param;
+ localStorageClass = param;
}
@@ -7994,7 +8078,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localAWSAccessKeyId = param;
+ localAWSAccessKeyId = param;
}
@@ -8032,7 +8116,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localTimestamp = param;
+ localTimestamp = param;
}
@@ -8070,7 +8154,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localSignature = param;
+ localSignature = param;
}
@@ -8108,7 +8192,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localCredential = param;
+ localCredential = param;
}
@@ -8138,6 +8222,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, MY_QNAME) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
PutObjectInline.this.serialize(MY_QNAME, factory, xmlWriter);
}
@@ -8146,12 +8231,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -8613,6 +8700,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -8862,7 +8950,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
new javax.xml.namespace.QName(org.apache.axiom.om.impl.MTOMConstants.XOP_NAMESPACE_URI,
org.apache.axiom.om.impl.MTOMConstants.XOP_INCLUDE))) {
java.lang.String id = org.apache.axiom.om.util.ElementHelper.getContentID(reader, "UTF-8");
- object.setData(((org.apache.axiom.soap.impl.builder.MTOMStAXSOAPModelBuilder)((org.apache.axiom.om.impl.llom.OMStAXWrapper)reader).getBuilder()).getDataHandler(id));
+ object.setData(((org.apache.axiom.soap.impl.builder.MTOMStAXSOAPModelBuilder)((org.apache.axiom.om.impl.llom.OMStAXWrapper)reader)
+ .getBuilder()).getDataHandler(id));
reader.next();
reader.next();
@@ -9054,7 +9143,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setBucketName(java.lang.String param) {
- this.localBucketName = param;
+ localBucketName = param;
}
@@ -9084,6 +9173,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, parentQName) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
CreateBucketResult.this.serialize(parentQName, factory, xmlWriter);
}
@@ -9092,12 +9182,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -9313,6 +9405,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -9451,7 +9544,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setCode(int param) {
- this.localCode = param;
+ localCode = param;
}
@@ -9475,7 +9568,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setDescription(java.lang.String param) {
- this.localDescription = param;
+ localDescription = param;
}
@@ -9505,6 +9598,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, parentQName) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
Status.this.serialize(parentQName, factory, xmlWriter);
}
@@ -9513,12 +9607,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -9763,6 +9859,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -9920,7 +10017,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setCreateBucketReturn(CreateBucketResult param) {
- this.localCreateBucketReturn = param;
+ localCreateBucketReturn = param;
}
@@ -9950,6 +10047,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, MY_QNAME) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
CreateBucketResponse.this.serialize(MY_QNAME, factory, xmlWriter);
}
@@ -9958,12 +10056,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -10152,6 +10252,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -10285,7 +10386,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setBucket(java.lang.String param) {
- this.localBucket = param;
+ localBucket = param;
}
@@ -10309,7 +10410,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setKey(java.lang.String param) {
- this.localKey = param;
+ localKey = param;
}
@@ -10333,7 +10434,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setGetMetadata(boolean param) {
- this.localGetMetadata = param;
+ localGetMetadata = param;
}
@@ -10357,7 +10458,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setGetData(boolean param) {
- this.localGetData = param;
+ localGetData = param;
}
@@ -10381,7 +10482,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setInlineData(boolean param) {
- this.localInlineData = param;
+ localInlineData = param;
}
@@ -10420,7 +10521,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
localByteRangeStartTracker = true;
}
- this.localByteRangeStart = param;
+ localByteRangeStart = param;
}
@@ -10459,7 +10560,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
localByteRangeEndTracker = true;
}
- this.localByteRangeEnd = param;
+ localByteRangeEnd = param;
}
@@ -10497,7 +10598,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localIfModifiedSince = param;
+ localIfModifiedSince = param;
}
@@ -10535,7 +10636,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localIfUnmodifiedSince = param;
+ localIfUnmodifiedSince = param;
}
@@ -10587,7 +10688,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localIfMatch = param;
+ localIfMatch = param;
}
/**
@@ -10604,7 +10705,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localIfMatch);
list.add(param);
- this.localIfMatch = (java.lang.String[])list.toArray(new java.lang.String[list.size()]);
+ localIfMatch = (java.lang.String[])list.toArray(new java.lang.String[list.size()]);
}
@@ -10656,7 +10757,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localIfNoneMatch = param;
+ localIfNoneMatch = param;
}
/**
@@ -10673,7 +10774,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localIfNoneMatch);
list.add(param);
- this.localIfNoneMatch = (java.lang.String[])list.toArray(new java.lang.String[list.size()]);
+ localIfNoneMatch = (java.lang.String[])list.toArray(new java.lang.String[list.size()]);
}
@@ -10712,7 +10813,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
localReturnCompleteObjectOnConditionFailureTracker = true;
}
- this.localReturnCompleteObjectOnConditionFailure = param;
+ localReturnCompleteObjectOnConditionFailure = param;
}
@@ -10750,7 +10851,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localAWSAccessKeyId = param;
+ localAWSAccessKeyId = param;
}
@@ -10788,7 +10889,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localTimestamp = param;
+ localTimestamp = param;
}
@@ -10826,7 +10927,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localSignature = param;
+ localSignature = param;
}
@@ -10864,7 +10965,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localCredential = param;
+ localCredential = param;
}
@@ -10894,6 +10995,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, MY_QNAME) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
GetObjectExtended.this.serialize(MY_QNAME, factory, xmlWriter);
}
@@ -10902,12 +11004,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -11615,6 +11719,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -12200,7 +12305,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setListAllMyBucketsResponse(ListAllMyBucketsResult param) {
- this.localListAllMyBucketsResponse = param;
+ localListAllMyBucketsResponse = param;
}
@@ -12230,6 +12335,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, MY_QNAME) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
ListAllMyBucketsResponse.this.serialize(MY_QNAME, factory, xmlWriter);
}
@@ -12238,12 +12344,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -12433,6 +12541,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -12567,7 +12676,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setBucket(java.lang.String param) {
- this.localBucket = param;
+ localBucket = param;
}
@@ -12605,7 +12714,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localAccessControlList = param;
+ localAccessControlList = param;
}
@@ -12643,7 +12752,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localAWSAccessKeyId = param;
+ localAWSAccessKeyId = param;
}
@@ -12681,7 +12790,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localTimestamp = param;
+ localTimestamp = param;
}
@@ -12719,7 +12828,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localSignature = param;
+ localSignature = param;
}
@@ -12757,7 +12866,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localCredential = param;
+ localCredential = param;
}
@@ -12787,6 +12896,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, MY_QNAME) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
SetBucketAccessControlPolicy.this.serialize(MY_QNAME, factory, xmlWriter);
}
@@ -12795,12 +12905,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -13153,6 +13265,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -13416,7 +13529,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setGetObjectAccessControlPolicyResponse(AccessControlPolicy param) {
- this.localGetObjectAccessControlPolicyResponse = param;
+ localGetObjectAccessControlPolicyResponse = param;
}
@@ -13446,6 +13559,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, MY_QNAME) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
GetObjectAccessControlPolicyResponse.this.serialize(MY_QNAME, factory, xmlWriter);
}
@@ -13454,12 +13568,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -13649,6 +13765,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -13782,7 +13899,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setDeleteObjectResponse(Status param) {
- this.localDeleteObjectResponse = param;
+ localDeleteObjectResponse = param;
}
@@ -13812,6 +13929,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, MY_QNAME) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
DeleteObjectResponse.this.serialize(MY_QNAME, factory, xmlWriter);
}
@@ -13820,12 +13938,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -14014,6 +14134,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -14148,7 +14269,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setBucket(java.lang.String param) {
- this.localBucket = param;
+ localBucket = param;
}
@@ -14186,7 +14307,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localAWSAccessKeyId = param;
+ localAWSAccessKeyId = param;
}
@@ -14224,7 +14345,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localTimestamp = param;
+ localTimestamp = param;
}
@@ -14262,7 +14383,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localSignature = param;
+ localSignature = param;
}
@@ -14300,7 +14421,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localCredential = param;
+ localCredential = param;
}
@@ -14330,6 +14451,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, MY_QNAME) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
GetBucketLoggingStatus.this.serialize(MY_QNAME, factory, xmlWriter);
}
@@ -14338,12 +14460,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -14690,6 +14814,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -14932,7 +15057,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setTargetBucket(java.lang.String param) {
- this.localTargetBucket = param;
+ localTargetBucket = param;
}
@@ -14956,7 +15081,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setTargetPrefix(java.lang.String param) {
- this.localTargetPrefix = param;
+ localTargetPrefix = param;
}
@@ -14994,7 +15119,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localTargetGrants = param;
+ localTargetGrants = param;
}
@@ -15024,6 +15149,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, parentQName) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
LoggingSettings.this.serialize(parentQName, factory, xmlWriter);
}
@@ -15032,12 +15158,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -15290,6 +15418,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -15628,7 +15757,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setBucket(java.lang.String param) {
- this.localBucket = param;
+ localBucket = param;
}
@@ -15666,7 +15795,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localAWSAccessKeyId = param;
+ localAWSAccessKeyId = param;
}
@@ -15704,7 +15833,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localTimestamp = param;
+ localTimestamp = param;
}
@@ -15742,7 +15871,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localSignature = param;
+ localSignature = param;
}
@@ -15780,7 +15909,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localCredential = param;
+ localCredential = param;
}
@@ -15810,6 +15939,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, MY_QNAME) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
DeleteBucket.this.serialize(MY_QNAME, factory, xmlWriter);
}
@@ -15818,12 +15948,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -16170,6 +16302,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -16409,7 +16542,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setDeleteBucketResponse(Status param) {
- this.localDeleteBucketResponse = param;
+ localDeleteBucketResponse = param;
}
@@ -16439,6 +16572,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, MY_QNAME) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
DeleteBucketResponse.this.serialize(MY_QNAME, factory, xmlWriter);
}
@@ -16447,12 +16581,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -16641,6 +16777,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -16777,7 +16914,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setLastModified(java.util.Calendar param) {
- this.localLastModified = param;
+ localLastModified = param;
}
@@ -16801,7 +16938,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setETag(java.lang.String param) {
- this.localETag = param;
+ localETag = param;
}
@@ -16831,6 +16968,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, parentQName) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
CopyObjectResult.this.serialize(parentQName, factory, xmlWriter);
}
@@ -16839,12 +16977,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -17092,6 +17232,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -17256,7 +17397,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setKey(java.lang.String param) {
- this.localKey = param;
+ localKey = param;
}
@@ -17280,7 +17421,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setLastModified(java.util.Calendar param) {
- this.localLastModified = param;
+ localLastModified = param;
}
@@ -17304,7 +17445,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setETag(java.lang.String param) {
- this.localETag = param;
+ localETag = param;
}
@@ -17328,7 +17469,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setSize(long param) {
- this.localSize = param;
+ localSize = param;
}
@@ -17366,7 +17507,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
- this.localOwner = param;
+ localOwner = param;
}
@@ -17390,7 +17531,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setStorageClass(StorageClass param) {
- this.localStorageClass = param;
+ localStorageClass = param;
}
@@ -17420,6 +17561,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, parentQName) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
ListEntry.this.serialize(parentQName, factory, xmlWriter);
}
@@ -17428,12 +17570,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -17752,6 +17896,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -18030,14 +18175,17 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
return localPermission;
}
+ @Override
public boolean equals(java.lang.Object obj) {
return (obj == this);
}
+ @Override
public int hashCode() {
return toString().hashCode();
}
+ @Override
public java.lang.String toString() {
return localPermission.toString();
@@ -18070,6 +18218,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, MY_QNAME) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
Permission.this.serialize(MY_QNAME, factory, xmlWriter);
}
@@ -18078,12 +18227,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -18276,6 +18427,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
//We can safely assume an element has only one type associated with it
@@ -18418,6 +18570,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, parentQName) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
Grantee.this.serialize(parentQName, factory, xmlWriter);
}
@@ -18426,12 +18579,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws javax.xml.stream.XMLStreamException,
org.apache.axis2.databinding.ADBException {
@@ -18615,6 +18770,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
* databinding method to get an XML representation of this object
*
*/
+ @Override
public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException {
java.util.ArrayList elementList = new java.util.ArrayList();
@@ -18722,7 +18878,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setOwner(CanonicalUser param) {
- this.localOwner = param;
+ localOwner = param;
}
@@ -18746,7 +18902,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
*/
public void setBuckets(ListAllMyBucketsList param) {
- this.localBuckets = param;
+ localBuckets = param;
}
@@ -18776,6 +18932,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(this, parentQName) {
+ @Override
public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
ListAllMyBucketsResult.this.serialize(parentQName, factory, xmlWriter);
}
@@ -18784,12 +18941,14 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub {
}
+ @Override
public void serialize(final javax.xml.namespace.QName parentQNam
<TRUNCATED>
[38/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java b/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
index 3672ab8..e04952a 100644
--- a/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
+++ b/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
@@ -29,7 +29,8 @@ package com.amazon.ec2;
public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.AbstractInOutMessageReceiver {
- public void invokeBusinessLogic(org.apache.axis2.context.MessageContext msgContext, org.apache.axis2.context.MessageContext newMsgContext) throws org.apache.axis2.AxisFault {
+ public void invokeBusinessLogic(org.apache.axis2.context.MessageContext msgContext, org.apache.axis2.context.MessageContext newMsgContext)
+ throws org.apache.axis2.AxisFault {
try {
@@ -52,12 +53,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("describePlacementGroups".equals(methodName)) {
com.amazon.ec2.DescribePlacementGroupsResponse describePlacementGroupsResponse289 = null;
- com.amazon.ec2.DescribePlacementGroups wrappedParam = (com.amazon.ec2.DescribePlacementGroups)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DescribePlacementGroups.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DescribePlacementGroups wrappedParam =
+ (com.amazon.ec2.DescribePlacementGroups)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.ec2.DescribePlacementGroups.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
describePlacementGroupsResponse289 =
- skel.describePlacementGroups(wrappedParam);
+ skel.describePlacementGroups(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), describePlacementGroupsResponse289, false);
} else
@@ -65,12 +67,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("createSecurityGroup".equals(methodName)) {
com.amazon.ec2.CreateSecurityGroupResponse createSecurityGroupResponse291 = null;
- com.amazon.ec2.CreateSecurityGroup wrappedParam = (com.amazon.ec2.CreateSecurityGroup)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.CreateSecurityGroup.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.CreateSecurityGroup wrappedParam =
+ (com.amazon.ec2.CreateSecurityGroup)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateSecurityGroup.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
createSecurityGroupResponse291 =
- skel.createSecurityGroup(wrappedParam);
+ skel.createSecurityGroup(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), createSecurityGroupResponse291, false);
} else
@@ -78,13 +81,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("resetNetworkInterfaceAttribute".equals(methodName)) {
com.amazon.ec2.ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttributeResponse293 = null;
- com.amazon.ec2.ResetNetworkInterfaceAttribute wrappedParam = (com.amazon.ec2.ResetNetworkInterfaceAttribute)fromOM(msgContext.getEnvelope()
- .getBody()
- .getFirstElement(), com.amazon.ec2.ResetNetworkInterfaceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.ResetNetworkInterfaceAttribute wrappedParam =
+ (com.amazon.ec2.ResetNetworkInterfaceAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.ec2.ResetNetworkInterfaceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
resetNetworkInterfaceAttributeResponse293 =
- skel.resetNetworkInterfaceAttribute(wrappedParam);
+ skel.resetNetworkInterfaceAttribute(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), resetNetworkInterfaceAttributeResponse293, false);
} else
@@ -92,12 +95,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("createDhcpOptions".equals(methodName)) {
com.amazon.ec2.CreateDhcpOptionsResponse createDhcpOptionsResponse295 = null;
- com.amazon.ec2.CreateDhcpOptions wrappedParam = (com.amazon.ec2.CreateDhcpOptions)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.CreateDhcpOptions.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.CreateDhcpOptions wrappedParam =
+ (com.amazon.ec2.CreateDhcpOptions)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateDhcpOptions.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
createDhcpOptionsResponse295 =
- skel.createDhcpOptions(wrappedParam);
+ skel.createDhcpOptions(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), createDhcpOptionsResponse295, false);
} else
@@ -105,12 +109,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("createRouteTable".equals(methodName)) {
com.amazon.ec2.CreateRouteTableResponse createRouteTableResponse297 = null;
- com.amazon.ec2.CreateRouteTable wrappedParam = (com.amazon.ec2.CreateRouteTable)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.CreateRouteTable.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.CreateRouteTable wrappedParam =
+ (com.amazon.ec2.CreateRouteTable)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateRouteTable.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
createRouteTableResponse297 =
- skel.createRouteTable(wrappedParam);
+ skel.createRouteTable(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), createRouteTableResponse297, false);
} else
@@ -118,12 +123,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("describeSubnets".equals(methodName)) {
com.amazon.ec2.DescribeSubnetsResponse describeSubnetsResponse299 = null;
- com.amazon.ec2.DescribeSubnets wrappedParam = (com.amazon.ec2.DescribeSubnets)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DescribeSubnets.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DescribeSubnets wrappedParam =
+ (com.amazon.ec2.DescribeSubnets)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeSubnets.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
describeSubnetsResponse299 =
- skel.describeSubnets(wrappedParam);
+ skel.describeSubnets(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), describeSubnetsResponse299, false);
} else
@@ -131,12 +137,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("deactivateLicense".equals(methodName)) {
com.amazon.ec2.DeactivateLicenseResponse deactivateLicenseResponse301 = null;
- com.amazon.ec2.DeactivateLicense wrappedParam = (com.amazon.ec2.DeactivateLicense)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DeactivateLicense.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DeactivateLicense wrappedParam =
+ (com.amazon.ec2.DeactivateLicense)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeactivateLicense.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
deactivateLicenseResponse301 =
- skel.deactivateLicense(wrappedParam);
+ skel.deactivateLicense(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), deactivateLicenseResponse301, false);
} else
@@ -144,12 +151,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("deleteVpc".equals(methodName)) {
com.amazon.ec2.DeleteVpcResponse deleteVpcResponse303 = null;
- com.amazon.ec2.DeleteVpc wrappedParam = (com.amazon.ec2.DeleteVpc)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteVpc.class,
- getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DeleteVpc wrappedParam =
+ (com.amazon.ec2.DeleteVpc)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteVpc.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
deleteVpcResponse303 =
- skel.deleteVpc(wrappedParam);
+ skel.deleteVpc(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), deleteVpcResponse303, false);
} else
@@ -157,12 +165,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("cancelSpotInstanceRequests".equals(methodName)) {
com.amazon.ec2.CancelSpotInstanceRequestsResponse cancelSpotInstanceRequestsResponse305 = null;
- com.amazon.ec2.CancelSpotInstanceRequests wrappedParam = (com.amazon.ec2.CancelSpotInstanceRequests)fromOM(
- msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CancelSpotInstanceRequests.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.CancelSpotInstanceRequests wrappedParam =
+ (com.amazon.ec2.CancelSpotInstanceRequests)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.ec2.CancelSpotInstanceRequests.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
cancelSpotInstanceRequestsResponse305 =
- skel.cancelSpotInstanceRequests(wrappedParam);
+ skel.cancelSpotInstanceRequests(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), cancelSpotInstanceRequestsResponse305, false);
} else
@@ -170,12 +179,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("createSubnet".equals(methodName)) {
com.amazon.ec2.CreateSubnetResponse createSubnetResponse307 = null;
- com.amazon.ec2.CreateSubnet wrappedParam = (com.amazon.ec2.CreateSubnet)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.CreateSubnet.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.CreateSubnet wrappedParam =
+ (com.amazon.ec2.CreateSubnet)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateSubnet.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
createSubnetResponse307 =
- skel.createSubnet(wrappedParam);
+ skel.createSubnet(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), createSubnetResponse307, false);
} else
@@ -183,12 +193,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("deleteVpnGateway".equals(methodName)) {
com.amazon.ec2.DeleteVpnGatewayResponse deleteVpnGatewayResponse309 = null;
- com.amazon.ec2.DeleteVpnGateway wrappedParam = (com.amazon.ec2.DeleteVpnGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DeleteVpnGateway.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DeleteVpnGateway wrappedParam =
+ (com.amazon.ec2.DeleteVpnGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteVpnGateway.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
deleteVpnGatewayResponse309 =
- skel.deleteVpnGateway(wrappedParam);
+ skel.deleteVpnGateway(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), deleteVpnGatewayResponse309, false);
} else
@@ -196,12 +207,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("createNetworkAclEntry".equals(methodName)) {
com.amazon.ec2.CreateNetworkAclEntryResponse createNetworkAclEntryResponse311 = null;
- com.amazon.ec2.CreateNetworkAclEntry wrappedParam = (com.amazon.ec2.CreateNetworkAclEntry)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.CreateNetworkAclEntry.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.CreateNetworkAclEntry wrappedParam =
+ (com.amazon.ec2.CreateNetworkAclEntry)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateNetworkAclEntry.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
createNetworkAclEntryResponse311 =
- skel.createNetworkAclEntry(wrappedParam);
+ skel.createNetworkAclEntry(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), createNetworkAclEntryResponse311, false);
} else
@@ -209,12 +221,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("requestSpotInstances".equals(methodName)) {
com.amazon.ec2.RequestSpotInstancesResponse requestSpotInstancesResponse313 = null;
- com.amazon.ec2.RequestSpotInstances wrappedParam = (com.amazon.ec2.RequestSpotInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.RequestSpotInstances.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.RequestSpotInstances wrappedParam =
+ (com.amazon.ec2.RequestSpotInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.RequestSpotInstances.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
requestSpotInstancesResponse313 =
- skel.requestSpotInstances(wrappedParam);
+ skel.requestSpotInstances(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), requestSpotInstancesResponse313, false);
} else
@@ -222,12 +235,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("describeVolumeAttribute".equals(methodName)) {
com.amazon.ec2.DescribeVolumeAttributeResponse describeVolumeAttributeResponse315 = null;
- com.amazon.ec2.DescribeVolumeAttribute wrappedParam = (com.amazon.ec2.DescribeVolumeAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DescribeVolumeAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DescribeVolumeAttribute wrappedParam =
+ (com.amazon.ec2.DescribeVolumeAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.ec2.DescribeVolumeAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
describeVolumeAttributeResponse315 =
- skel.describeVolumeAttribute(wrappedParam);
+ skel.describeVolumeAttribute(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), describeVolumeAttributeResponse315, false);
} else
@@ -235,12 +249,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("associateDhcpOptions".equals(methodName)) {
com.amazon.ec2.AssociateDhcpOptionsResponse associateDhcpOptionsResponse317 = null;
- com.amazon.ec2.AssociateDhcpOptions wrappedParam = (com.amazon.ec2.AssociateDhcpOptions)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.AssociateDhcpOptions.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.AssociateDhcpOptions wrappedParam =
+ (com.amazon.ec2.AssociateDhcpOptions)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.AssociateDhcpOptions.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
associateDhcpOptionsResponse317 =
- skel.associateDhcpOptions(wrappedParam);
+ skel.associateDhcpOptions(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), associateDhcpOptionsResponse317, false);
} else
@@ -248,12 +263,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("describeTags".equals(methodName)) {
com.amazon.ec2.DescribeTagsResponse describeTagsResponse319 = null;
- com.amazon.ec2.DescribeTags wrappedParam = (com.amazon.ec2.DescribeTags)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DescribeTags.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DescribeTags wrappedParam =
+ (com.amazon.ec2.DescribeTags)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeTags.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
describeTagsResponse319 =
- skel.describeTags(wrappedParam);
+ skel.describeTags(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), describeTagsResponse319, false);
} else
@@ -261,12 +277,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("importKeyPair".equals(methodName)) {
com.amazon.ec2.ImportKeyPairResponse importKeyPairResponse321 = null;
- com.amazon.ec2.ImportKeyPair wrappedParam = (com.amazon.ec2.ImportKeyPair)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.ImportKeyPair.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.ImportKeyPair wrappedParam =
+ (com.amazon.ec2.ImportKeyPair)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ImportKeyPair.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
importKeyPairResponse321 =
- skel.importKeyPair(wrappedParam);
+ skel.importKeyPair(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), importKeyPairResponse321, false);
} else
@@ -274,12 +291,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("deleteNetworkInterface".equals(methodName)) {
com.amazon.ec2.DeleteNetworkInterfaceResponse deleteNetworkInterfaceResponse323 = null;
- com.amazon.ec2.DeleteNetworkInterface wrappedParam = (com.amazon.ec2.DeleteNetworkInterface)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DeleteNetworkInterface.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DeleteNetworkInterface wrappedParam =
+ (com.amazon.ec2.DeleteNetworkInterface)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteNetworkInterface.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
deleteNetworkInterfaceResponse323 =
- skel.deleteNetworkInterface(wrappedParam);
+ skel.deleteNetworkInterface(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), deleteNetworkInterfaceResponse323, false);
} else
@@ -287,12 +305,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("describeVpcs".equals(methodName)) {
com.amazon.ec2.DescribeVpcsResponse describeVpcsResponse325 = null;
- com.amazon.ec2.DescribeVpcs wrappedParam = (com.amazon.ec2.DescribeVpcs)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DescribeVpcs.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DescribeVpcs wrappedParam =
+ (com.amazon.ec2.DescribeVpcs)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeVpcs.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
describeVpcsResponse325 =
- skel.describeVpcs(wrappedParam);
+ skel.describeVpcs(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), describeVpcsResponse325, false);
} else
@@ -300,12 +319,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("describeLicenses".equals(methodName)) {
com.amazon.ec2.DescribeLicensesResponse describeLicensesResponse327 = null;
- com.amazon.ec2.DescribeLicenses wrappedParam = (com.amazon.ec2.DescribeLicenses)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DescribeLicenses.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DescribeLicenses wrappedParam =
+ (com.amazon.ec2.DescribeLicenses)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeLicenses.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
describeLicensesResponse327 =
- skel.describeLicenses(wrappedParam);
+ skel.describeLicenses(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), describeLicensesResponse327, false);
} else
@@ -313,12 +333,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("bundleInstance".equals(methodName)) {
com.amazon.ec2.BundleInstanceResponse bundleInstanceResponse329 = null;
- com.amazon.ec2.BundleInstance wrappedParam = (com.amazon.ec2.BundleInstance)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.BundleInstance.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.BundleInstance wrappedParam =
+ (com.amazon.ec2.BundleInstance)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.BundleInstance.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
bundleInstanceResponse329 =
- skel.bundleInstance(wrappedParam);
+ skel.bundleInstance(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), bundleInstanceResponse329, false);
} else
@@ -326,12 +347,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("describeVpnConnections".equals(methodName)) {
com.amazon.ec2.DescribeVpnConnectionsResponse describeVpnConnectionsResponse331 = null;
- com.amazon.ec2.DescribeVpnConnections wrappedParam = (com.amazon.ec2.DescribeVpnConnections)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DescribeVpnConnections.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DescribeVpnConnections wrappedParam =
+ (com.amazon.ec2.DescribeVpnConnections)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeVpnConnections.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
describeVpnConnectionsResponse331 =
- skel.describeVpnConnections(wrappedParam);
+ skel.describeVpnConnections(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), describeVpnConnectionsResponse331, false);
} else
@@ -339,12 +361,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("describeImages".equals(methodName)) {
com.amazon.ec2.DescribeImagesResponse describeImagesResponse333 = null;
- com.amazon.ec2.DescribeImages wrappedParam = (com.amazon.ec2.DescribeImages)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DescribeImages.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DescribeImages wrappedParam =
+ (com.amazon.ec2.DescribeImages)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeImages.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
describeImagesResponse333 =
- skel.describeImages(wrappedParam);
+ skel.describeImages(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), describeImagesResponse333, false);
} else
@@ -352,12 +375,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("createInternetGateway".equals(methodName)) {
com.amazon.ec2.CreateInternetGatewayResponse createInternetGatewayResponse335 = null;
- com.amazon.ec2.CreateInternetGateway wrappedParam = (com.amazon.ec2.CreateInternetGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.CreateInternetGateway.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.CreateInternetGateway wrappedParam =
+ (com.amazon.ec2.CreateInternetGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateInternetGateway.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
createInternetGatewayResponse335 =
- skel.createInternetGateway(wrappedParam);
+ skel.createInternetGateway(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), createInternetGatewayResponse335, false);
} else
@@ -365,12 +389,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("disassociateRouteTable".equals(methodName)) {
com.amazon.ec2.DisassociateRouteTableResponse disassociateRouteTableResponse337 = null;
- com.amazon.ec2.DisassociateRouteTable wrappedParam = (com.amazon.ec2.DisassociateRouteTable)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DisassociateRouteTable.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DisassociateRouteTable wrappedParam =
+ (com.amazon.ec2.DisassociateRouteTable)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DisassociateRouteTable.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
disassociateRouteTableResponse337 =
- skel.disassociateRouteTable(wrappedParam);
+ skel.disassociateRouteTable(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), disassociateRouteTableResponse337, false);
} else
@@ -378,12 +403,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("replaceNetworkAclEntry".equals(methodName)) {
com.amazon.ec2.ReplaceNetworkAclEntryResponse replaceNetworkAclEntryResponse339 = null;
- com.amazon.ec2.ReplaceNetworkAclEntry wrappedParam = (com.amazon.ec2.ReplaceNetworkAclEntry)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.ReplaceNetworkAclEntry.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.ReplaceNetworkAclEntry wrappedParam =
+ (com.amazon.ec2.ReplaceNetworkAclEntry)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ReplaceNetworkAclEntry.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
replaceNetworkAclEntryResponse339 =
- skel.replaceNetworkAclEntry(wrappedParam);
+ skel.replaceNetworkAclEntry(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), replaceNetworkAclEntryResponse339, false);
} else
@@ -391,13 +417,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("authorizeSecurityGroupIngress".equals(methodName)) {
com.amazon.ec2.AuthorizeSecurityGroupIngressResponse authorizeSecurityGroupIngressResponse341 = null;
- com.amazon.ec2.AuthorizeSecurityGroupIngress wrappedParam = (com.amazon.ec2.AuthorizeSecurityGroupIngress)fromOM(msgContext.getEnvelope()
- .getBody()
- .getFirstElement(), com.amazon.ec2.AuthorizeSecurityGroupIngress.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.AuthorizeSecurityGroupIngress wrappedParam =
+ (com.amazon.ec2.AuthorizeSecurityGroupIngress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.ec2.AuthorizeSecurityGroupIngress.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
authorizeSecurityGroupIngressResponse341 =
- skel.authorizeSecurityGroupIngress(wrappedParam);
+ skel.authorizeSecurityGroupIngress(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), authorizeSecurityGroupIngressResponse341, false);
} else
@@ -405,12 +431,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("describeSnapshotAttribute".equals(methodName)) {
com.amazon.ec2.DescribeSnapshotAttributeResponse describeSnapshotAttributeResponse343 = null;
- com.amazon.ec2.DescribeSnapshotAttribute wrappedParam = (com.amazon.ec2.DescribeSnapshotAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DescribeSnapshotAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DescribeSnapshotAttribute wrappedParam =
+ (com.amazon.ec2.DescribeSnapshotAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.ec2.DescribeSnapshotAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
describeSnapshotAttributeResponse343 =
- skel.describeSnapshotAttribute(wrappedParam);
+ skel.describeSnapshotAttribute(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), describeSnapshotAttributeResponse343, false);
} else
@@ -418,12 +445,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("createVpnGateway".equals(methodName)) {
com.amazon.ec2.CreateVpnGatewayResponse createVpnGatewayResponse345 = null;
- com.amazon.ec2.CreateVpnGateway wrappedParam = (com.amazon.ec2.CreateVpnGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.CreateVpnGateway.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.CreateVpnGateway wrappedParam =
+ (com.amazon.ec2.CreateVpnGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateVpnGateway.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
createVpnGatewayResponse345 =
- skel.createVpnGateway(wrappedParam);
+ skel.createVpnGateway(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), createVpnGatewayResponse345, false);
} else
@@ -431,12 +459,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("resetInstanceAttribute".equals(methodName)) {
com.amazon.ec2.ResetInstanceAttributeResponse resetInstanceAttributeResponse347 = null;
- com.amazon.ec2.ResetInstanceAttribute wrappedParam = (com.amazon.ec2.ResetInstanceAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.ResetInstanceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.ResetInstanceAttribute wrappedParam =
+ (com.amazon.ec2.ResetInstanceAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ResetInstanceAttribute.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
resetInstanceAttributeResponse347 =
- skel.resetInstanceAttribute(wrappedParam);
+ skel.resetInstanceAttribute(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), resetInstanceAttributeResponse347, false);
} else
@@ -444,12 +473,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("createTags".equals(methodName)) {
com.amazon.ec2.CreateTagsResponse createTagsResponse349 = null;
- com.amazon.ec2.CreateTags wrappedParam = (com.amazon.ec2.CreateTags)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.CreateTags.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.CreateTags wrappedParam =
+ (com.amazon.ec2.CreateTags)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateTags.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
createTagsResponse349 =
- skel.createTags(wrappedParam);
+ skel.createTags(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), createTagsResponse349, false);
} else
@@ -457,13 +487,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("authorizeSecurityGroupEgress".equals(methodName)) {
com.amazon.ec2.AuthorizeSecurityGroupEgressResponse authorizeSecurityGroupEgressResponse351 = null;
- com.amazon.ec2.AuthorizeSecurityGroupEgress wrappedParam = (com.amazon.ec2.AuthorizeSecurityGroupEgress)fromOM(msgContext.getEnvelope()
- .getBody()
- .getFirstElement(), com.amazon.ec2.AuthorizeSecurityGroupEgress.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.AuthorizeSecurityGroupEgress wrappedParam =
+ (com.amazon.ec2.AuthorizeSecurityGroupEgress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.ec2.AuthorizeSecurityGroupEgress.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
authorizeSecurityGroupEgressResponse351 =
- skel.authorizeSecurityGroupEgress(wrappedParam);
+ skel.authorizeSecurityGroupEgress(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), authorizeSecurityGroupEgressResponse351, false);
} else
@@ -471,12 +501,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("associateAddress".equals(methodName)) {
com.amazon.ec2.AssociateAddressResponse associateAddressResponse353 = null;
- com.amazon.ec2.AssociateAddress wrappedParam = (com.amazon.ec2.AssociateAddress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.AssociateAddress.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.AssociateAddress wrappedParam =
+ (com.amazon.ec2.AssociateAddress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.AssociateAddress.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
associateAddressResponse353 =
- skel.associateAddress(wrappedParam);
+ skel.associateAddress(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), associateAddressResponse353, false);
} else
@@ -484,12 +515,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("describeImageAttribute".equals(methodName)) {
com.amazon.ec2.DescribeImageAttributeResponse describeImageAttributeResponse355 = null;
- com.amazon.ec2.DescribeImageAttribute wrappedParam = (com.amazon.ec2.DescribeImageAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DescribeImageAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DescribeImageAttribute wrappedParam =
+ (com.amazon.ec2.DescribeImageAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeImageAttribute.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
describeImageAttributeResponse355 =
- skel.describeImageAttribute(wrappedParam);
+ skel.describeImageAttribute(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), describeImageAttributeResponse355, false);
} else
@@ -497,12 +529,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("describeSpotPriceHistory".equals(methodName)) {
com.amazon.ec2.DescribeSpotPriceHistoryResponse describeSpotPriceHistoryResponse357 = null;
- com.amazon.ec2.DescribeSpotPriceHistory wrappedParam = (com.amazon.ec2.DescribeSpotPriceHistory)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DescribeSpotPriceHistory.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DescribeSpotPriceHistory wrappedParam =
+ (com.amazon.ec2.DescribeSpotPriceHistory)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.ec2.DescribeSpotPriceHistory.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
describeSpotPriceHistoryResponse357 =
- skel.describeSpotPriceHistory(wrappedParam);
+ skel.describeSpotPriceHistory(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), describeSpotPriceHistoryResponse357, false);
} else
@@ -510,12 +543,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("modifySnapshotAttribute".equals(methodName)) {
com.amazon.ec2.ModifySnapshotAttributeResponse modifySnapshotAttributeResponse359 = null;
- com.amazon.ec2.ModifySnapshotAttribute wrappedParam = (com.amazon.ec2.ModifySnapshotAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.ModifySnapshotAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.ModifySnapshotAttribute wrappedParam =
+ (com.amazon.ec2.ModifySnapshotAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.ec2.ModifySnapshotAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
modifySnapshotAttributeResponse359 =
- skel.modifySnapshotAttribute(wrappedParam);
+ skel.modifySnapshotAttribute(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), modifySnapshotAttributeResponse359, false);
} else
@@ -523,13 +557,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("describeSpotInstanceRequests".equals(methodName)) {
com.amazon.ec2.DescribeSpotInstanceRequestsResponse describeSpotInstanceRequestsResponse361 = null;
- com.amazon.ec2.DescribeSpotInstanceRequests wrappedParam = (com.amazon.ec2.DescribeSpotInstanceRequests)fromOM(msgContext.getEnvelope()
- .getBody()
- .getFirstElement(), com.amazon.ec2.DescribeSpotInstanceRequests.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DescribeSpotInstanceRequests wrappedParam =
+ (com.amazon.ec2.DescribeSpotInstanceRequests)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.ec2.DescribeSpotInstanceRequests.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
describeSpotInstanceRequestsResponse361 =
- skel.describeSpotInstanceRequests(wrappedParam);
+ skel.describeSpotInstanceRequests(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), describeSpotInstanceRequestsResponse361, false);
} else
@@ -537,12 +571,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("importInstance".equals(methodName)) {
com.amazon.ec2.ImportInstanceResponse importInstanceResponse363 = null;
- com.amazon.ec2.ImportInstance wrappedParam = (com.amazon.ec2.ImportInstance)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.ImportInstance.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.ImportInstance wrappedParam =
+ (com.amazon.ec2.ImportInstance)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ImportInstance.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
importInstanceResponse363 =
- skel.importInstance(wrappedParam);
+ skel.importInstance(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), importInstanceResponse363, false);
} else
@@ -550,12 +585,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("describeKeyPairs".equals(methodName)) {
com.amazon.ec2.DescribeKeyPairsResponse describeKeyPairsResponse365 = null;
- com.amazon.ec2.DescribeKeyPairs wrappedParam = (com.amazon.ec2.DescribeKeyPairs)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DescribeKeyPairs.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DescribeKeyPairs wrappedParam =
+ (com.amazon.ec2.DescribeKeyPairs)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeKeyPairs.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
describeKeyPairsResponse365 =
- skel.describeKeyPairs(wrappedParam);
+ skel.describeKeyPairs(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), describeKeyPairsResponse365, false);
} else
@@ -563,12 +599,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("revokeSecurityGroupIngress".equals(methodName)) {
com.amazon.ec2.RevokeSecurityGroupIngressResponse revokeSecurityGroupIngressResponse367 = null;
- com.amazon.ec2.RevokeSecurityGroupIngress wrappedParam = (com.amazon.ec2.RevokeSecurityGroupIngress)fromOM(
- msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.RevokeSecurityGroupIngress.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.RevokeSecurityGroupIngress wrappedParam =
+ (com.amazon.ec2.RevokeSecurityGroupIngress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.ec2.RevokeSecurityGroupIngress.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
revokeSecurityGroupIngressResponse367 =
- skel.revokeSecurityGroupIngress(wrappedParam);
+ skel.revokeSecurityGroupIngress(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), revokeSecurityGroupIngressResponse367, false);
} else
@@ -576,12 +613,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("createPlacementGroup".equals(methodName)) {
com.amazon.ec2.CreatePlacementGroupResponse createPlacementGroupResponse369 = null;
- com.amazon.ec2.CreatePlacementGroup wrappedParam = (com.amazon.ec2.CreatePlacementGroup)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.CreatePlacementGroup.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.CreatePlacementGroup wrappedParam =
+ (com.amazon.ec2.CreatePlacementGroup)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreatePlacementGroup.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
createPlacementGroupResponse369 =
- skel.createPlacementGroup(wrappedParam);
+ skel.createPlacementGroup(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), createPlacementGroupResponse369, false);
} else
@@ -589,12 +627,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("deleteNetworkAclEntry".equals(methodName)) {
com.amazon.ec2.DeleteNetworkAclEntryResponse deleteNetworkAclEntryResponse371 = null;
- com.amazon.ec2.DeleteNetworkAclEntry wrappedParam = (com.amazon.ec2.DeleteNetworkAclEntry)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DeleteNetworkAclEntry.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DeleteNetworkAclEntry wrappedParam =
+ (com.amazon.ec2.DeleteNetworkAclEntry)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteNetworkAclEntry.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
deleteNetworkAclEntryResponse371 =
- skel.deleteNetworkAclEntry(wrappedParam);
+ skel.deleteNetworkAclEntry(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), deleteNetworkAclEntryResponse371, false);
} else
@@ -602,12 +641,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("activateLicense".equals(methodName)) {
com.amazon.ec2.ActivateLicenseResponse activateLicenseResponse373 = null;
- com.amazon.ec2.ActivateLicense wrappedParam = (com.amazon.ec2.ActivateLicense)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.ActivateLicense.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.ActivateLicense wrappedParam =
+ (com.amazon.ec2.ActivateLicense)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ActivateLicense.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
activateLicenseResponse373 =
- skel.activateLicense(wrappedParam);
+ skel.activateLicense(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), activateLicenseResponse373, false);
} else
@@ -615,12 +655,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("deleteRouteTable".equals(methodName)) {
com.amazon.ec2.DeleteRouteTableResponse deleteRouteTableResponse375 = null;
- com.amazon.ec2.DeleteRouteTable wrappedParam = (com.amazon.ec2.DeleteRouteTable)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DeleteRouteTable.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DeleteRouteTable wrappedParam =
+ (com.amazon.ec2.DeleteRouteTable)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteRouteTable.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
deleteRouteTableResponse375 =
- skel.deleteRouteTable(wrappedParam);
+ skel.deleteRouteTable(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), deleteRouteTableResponse375, false);
} else
@@ -628,12 +669,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("unmonitorInstances".equals(methodName)) {
com.amazon.ec2.UnmonitorInstancesResponse unmonitorInstancesResponse377 = null;
- com.amazon.ec2.UnmonitorInstances wrappedParam = (com.amazon.ec2.UnmonitorInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.UnmonitorInstances.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.UnmonitorInstances wrappedParam =
+ (com.amazon.ec2.UnmonitorInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.UnmonitorInstances.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
unmonitorInstancesResponse377 =
- skel.unmonitorInstances(wrappedParam);
+ skel.unmonitorInstances(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), unmonitorInstancesResponse377, false);
} else
@@ -641,12 +683,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("startInstances".equals(methodName)) {
com.amazon.ec2.StartInstancesResponse startInstancesResponse379 = null;
- com.amazon.ec2.StartInstances wrappedParam = (com.amazon.ec2.StartInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.StartInstances.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.StartInstances wrappedParam =
+ (com.amazon.ec2.StartInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.StartInstances.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
startInstancesResponse379 =
- skel.startInstances(wrappedParam);
+ skel.startInstances(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), startInstancesResponse379, false);
} else
@@ -654,12 +697,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("confirmProductInstance".equals(methodName)) {
com.amazon.ec2.ConfirmProductInstanceResponse confirmProductInstanceResponse381 = null;
- com.amazon.ec2.ConfirmProductInstance wrappedParam = (com.amazon.ec2.ConfirmProductInstance)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.ConfirmProductInstance.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.ConfirmProductInstance wrappedParam =
+ (com.amazon.ec2.ConfirmProductInstance)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ConfirmProductInstance.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
confirmProductInstanceResponse381 =
- skel.confirmProductInstance(wrappedParam);
+ skel.confirmProductInstance(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), confirmProductInstanceResponse381, false);
} else
@@ -667,13 +711,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("describeNetworkInterfaceAttribute".equals(methodName)) {
com.amazon.ec2.DescribeNetworkInterfaceAttributeResponse describeNetworkInterfaceAttributeResponse383 = null;
- com.amazon.ec2.DescribeNetworkInterfaceAttribute wrappedParam = (com.amazon.ec2.DescribeNetworkInterfaceAttribute)fromOM(msgContext.getEnvelope()
- .getBody()
- .getFirstElement(), com.amazon.ec2.DescribeNetworkInterfaceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DescribeNetworkInterfaceAttribute wrappedParam =
+ (com.amazon.ec2.DescribeNetworkInterfaceAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.ec2.DescribeNetworkInterfaceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
describeNetworkInterfaceAttributeResponse383 =
- skel.describeNetworkInterfaceAttribute(wrappedParam);
+ skel.describeNetworkInterfaceAttribute(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), describeNetworkInterfaceAttributeResponse383, false);
} else
@@ -681,12 +725,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("runInstances".equals(methodName)) {
com.amazon.ec2.RunInstancesResponse runInstancesResponse385 = null;
- com.amazon.ec2.RunInstances wrappedParam = (com.amazon.ec2.RunInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.RunInstances.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.RunInstances wrappedParam =
+ (com.amazon.ec2.RunInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.RunInstances.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
runInstancesResponse385 =
- skel.runInstances(wrappedParam);
+ skel.runInstances(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), runInstancesResponse385, false);
} else
@@ -694,13 +739,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("createReservedInstancesListing".equals(methodName)) {
com.amazon.ec2.CreateReservedInstancesListingResponse createReservedInstancesListingResponse387 = null;
- com.amazon.ec2.CreateReservedInstancesListing wrappedParam = (com.amazon.ec2.CreateReservedInstancesListing)fromOM(msgContext.getEnvelope()
- .getBody()
- .getFirstElement(), com.amazon.ec2.CreateReservedInstancesListing.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.CreateReservedInstancesListing wrappedParam =
+ (com.amazon.ec2.CreateReservedInstancesListing)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.ec2.CreateReservedInstancesListing.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
createReservedInstancesListingResponse387 =
- skel.createReservedInstancesListing(wrappedParam);
+ skel.createReservedInstancesListing(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), createReservedInstancesListingResponse387, false);
} else
@@ -708,12 +753,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("createCustomerGateway".equals(methodName)) {
com.amazon.ec2.CreateCustomerGatewayResponse createCustomerGatewayResponse389 = null;
- com.amazon.ec2.CreateCustomerGateway wrappedParam = (com.amazon.ec2.CreateCustomerGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.CreateCustomerGateway.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.CreateCustomerGateway wrappedParam =
+ (com.amazon.ec2.CreateCustomerGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateCustomerGateway.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
createCustomerGatewayResponse389 =
- skel.createCustomerGateway(wrappedParam);
+ skel.createCustomerGateway(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), createCustomerGatewayResponse389, false);
} else
@@ -721,12 +767,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("createNetworkAcl".equals(methodName)) {
com.amazon.ec2.CreateNetworkAclResponse createNetworkAclResponse391 = null;
- com.amazon.ec2.CreateNetworkAcl wrappedParam = (com.amazon.ec2.CreateNetworkAcl)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.CreateNetworkAcl.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.CreateNetworkAcl wrappedParam =
+ (com.amazon.ec2.CreateNetworkAcl)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateNetworkAcl.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
createNetworkAclResponse391 =
- skel.createNetworkAcl(wrappedParam);
+ skel.createNetworkAcl(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), createNetworkAclResponse391, false);
} else
@@ -734,12 +781,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("resetImageAttribute".equals(methodName)) {
com.amazon.ec2.ResetImageAttributeResponse resetImageAttributeResponse393 = null;
- com.amazon.ec2.ResetImageAttribute wrappedParam = (com.amazon.ec2.ResetImageAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.ResetImageAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.ResetImageAttribute wrappedParam =
+ (com.amazon.ec2.ResetImageAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ResetImageAttribute.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
resetImageAttributeResponse393 =
- skel.resetImageAttribute(wrappedParam);
+ skel.resetImageAttribute(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), resetImageAttributeResponse393, false);
} else
@@ -747,12 +795,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("modifyVolumeAttribute".equals(methodName)) {
com.amazon.ec2.ModifyVolumeAttributeResponse modifyVolumeAttributeResponse395 = null;
- com.amazon.ec2.ModifyVolumeAttribute wrappedParam = (com.amazon.ec2.ModifyVolumeAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.ModifyVolumeAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.ModifyVolumeAttribute wrappedParam =
+ (com.amazon.ec2.ModifyVolumeAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ModifyVolumeAttribute.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
modifyVolumeAttributeResponse395 =
- skel.modifyVolumeAttribute(wrappedParam);
+ skel.modifyVolumeAttribute(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), modifyVolumeAttributeResponse395, false);
} else
@@ -760,12 +809,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("describeReservedInstances".equals(methodName)) {
com.amazon.ec2.DescribeReservedInstancesResponse describeReservedInstancesResponse397 = null;
- com.amazon.ec2.DescribeReservedInstances wrappedParam = (com.amazon.ec2.DescribeReservedInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DescribeReservedInstances.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DescribeReservedInstances wrappedParam =
+ (com.amazon.ec2.DescribeReservedInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.ec2.DescribeReservedInstances.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
describeReservedInstancesResponse397 =
- skel.describeReservedInstances(wrappedParam);
+ skel.describeReservedInstances(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), describeReservedInstancesResponse397, false);
} else
@@ -773,12 +823,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("resetSnapshotAttribute".equals(methodName)) {
com.amazon.ec2.ResetSnapshotAttributeResponse resetSnapshotAttributeResponse399 = null;
- com.amazon.ec2.ResetSnapshotAttribute wrappedParam = (com.amazon.ec2.ResetSnapshotAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.ResetSnapshotAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.ResetSnapshotAttribute wrappedParam =
+ (com.amazon.ec2.ResetSnapshotAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ResetSnapshotAttribute.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
resetSnapshotAttributeResponse399 =
- skel.resetSnapshotAttribute(wrappedParam);
+ skel.resetSnapshotAttribute(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), resetSnapshotAttributeResponse399, false);
} else
@@ -786,12 +837,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("deleteVolume".equals(methodName)) {
com.amazon.ec2.DeleteVolumeResponse deleteVolumeResponse401 = null;
- com.amazon.ec2.DeleteVolume wrappedParam = (com.amazon.ec2.DeleteVolume)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DeleteVolume.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DeleteVolume wrappedParam =
+ (com.amazon.ec2.DeleteVolume)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteVolume.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
deleteVolumeResponse401 =
- skel.deleteVolume(wrappedParam);
+ skel.deleteVolume(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), deleteVolumeResponse401, false);
} else
@@ -799,12 +851,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("describeAvailabilityZones".equals(methodName)) {
com.amazon.ec2.DescribeAvailabilityZonesResponse describeAvailabilityZonesResponse403 = null;
- com.amazon.ec2.DescribeAvailabilityZones wrappedParam = (com.amazon.ec2.DescribeAvailabilityZones)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DescribeAvailabilityZones.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DescribeAvailabilityZones wrappedParam =
+ (com.amazon.ec2.DescribeAvailabilityZones)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.ec2.DescribeAvailabilityZones.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
describeAvailabilityZonesResponse403 =
- skel.describeAvailabilityZones(wrappedParam);
+ skel.describeAvailabilityZones(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), describeAvailabilityZonesResponse403, false);
} else
@@ -812,12 +865,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("createVpnConnection".equals(methodName)) {
com.amazon.ec2.CreateVpnConnectionResponse createVpnConnectionResponse405 = null;
- com.amazon.ec2.CreateVpnConnection wrappedParam = (com.amazon.ec2.CreateVpnConnection)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.CreateVpnConnection.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.CreateVpnConnection wrappedParam =
+ (com.amazon.ec2.CreateVpnConnection)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateVpnConnection.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
createVpnConnectionResponse405 =
- skel.createVpnConnection(wrappedParam);
+ skel.createVpnConnection(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), createVpnConnectionResponse405, false);
} else
@@ -825,12 +879,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("cancelBundleTask".equals(methodName)) {
com.amazon.ec2.CancelBundleTaskResponse cancelBundleTaskResponse407 = null;
- com.amazon.ec2.CancelBundleTask wrappedParam = (com.amazon.ec2.CancelBundleTask)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.CancelBundleTask.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.CancelBundleTask wrappedParam =
+ (com.amazon.ec2.CancelBundleTask)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CancelBundleTask.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
cancelBundleTaskResponse407 =
- skel.cancelBundleTask(wrappedParam);
+ skel.cancelBundleTask(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), cancelBundleTaskResponse407, false);
} else
@@ -838,13 +893,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("replaceNetworkAclAssociation".equals(methodName)) {
com.amazon.ec2.ReplaceNetworkAclAssociationResponse replaceNetworkAclAssociationResponse409 = null;
- com.amazon.ec2.ReplaceNetworkAclAssociation wrappedParam = (com.amazon.ec2.ReplaceNetworkAclAssociation)fromOM(msgContext.getEnvelope()
- .getBody()
- .getFirstElement(), com.amazon.ec2.ReplaceNetworkAclAssociation.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.ReplaceNetworkAclAssociation wrappedParam =
+ (com.amazon.ec2.ReplaceNetworkAclAssociation)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.ec2.ReplaceNetworkAclAssociation.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
replaceNetworkAclAssociationResponse409 =
- skel.replaceNetworkAclAssociation(wrappedParam);
+ skel.replaceNetworkAclAssociation(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), replaceNetworkAclAssociationResponse409, false);
} else
@@ -852,12 +907,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("detachVpnGateway".equals(methodName)) {
com.amazon.ec2.DetachVpnGatewayResponse detachVpnGatewayResponse411 = null;
- com.amazon.ec2.DetachVpnGateway wrappedParam = (com.amazon.ec2.DetachVpnGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DetachVpnGateway.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DetachVpnGateway wrappedParam =
+ (com.amazon.ec2.DetachVpnGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DetachVpnGateway.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
detachVpnGatewayResponse411 =
- skel.detachVpnGateway(wrappedParam);
+ skel.detachVpnGateway(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), detachVpnGatewayResponse411, false);
} else
@@ -865,12 +921,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("describeSnapshots".equals(methodName)) {
com.amazon.ec2.DescribeSnapshotsResponse describeSnapshotsResponse413 = null;
- com.amazon.ec2.DescribeSnapshots wrappedParam = (com.amazon.ec2.DescribeSnapshots)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DescribeSnapshots.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DescribeSnapshots wrappedParam =
+ (com.amazon.ec2.DescribeSnapshots)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeSnapshots.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
describeSnapshotsResponse413 =
- skel.describeSnapshots(wrappedParam);
+ skel.describeSnapshots(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), describeSnapshotsResponse413, false);
} else
@@ -878,12 +935,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("deleteSubnet".equals(methodName)) {
com.amazon.ec2.DeleteSubnetResponse deleteSubnetResponse415 = null;
- com.amazon.ec2.DeleteSubnet wrappedParam = (com.amazon.ec2.DeleteSubnet)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DeleteSubnet.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DeleteSubnet wrappedParam =
+ (com.amazon.ec2.DeleteSubnet)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteSubnet.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
deleteSubnetResponse415 =
- skel.deleteSubnet(wrappedParam);
+ skel.deleteSubnet(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), deleteSubnetResponse415, false);
} else
@@ -891,12 +949,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("describeBundleTasks".equals(methodName)) {
com.amazon.ec2.DescribeBundleTasksResponse describeBundleTasksResponse417 = null;
- com.amazon.ec2.DescribeBundleTasks wrappedParam = (com.amazon.ec2.DescribeBundleTasks)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DescribeBundleTasks.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DescribeBundleTasks wrappedParam =
+ (com.amazon.ec2.DescribeBundleTasks)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeBundleTasks.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
describeBundleTasksResponse417 =
- skel.describeBundleTasks(wrappedParam);
+ skel.describeBundleTasks(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), describeBundleTasksResponse417, false);
} else
@@ -904,12 +963,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("createKeyPair".equals(methodName)) {
com.amazon.ec2.CreateKeyPairResponse createKeyPairResponse419 = null;
- com.amazon.ec2.CreateKeyPair wrappedParam = (com.amazon.ec2.CreateKeyPair)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.CreateKeyPair.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.CreateKeyPair wrappedParam =
+ (com.amazon.ec2.CreateKeyPair)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateKeyPair.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
createKeyPairResponse419 =
- skel.createKeyPair(wrappedParam);
+ skel.createKeyPair(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), createKeyPairResponse419, false);
} else
@@ -917,12 +977,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("createImage".equals(methodName)) {
com.amazon.ec2.CreateImageResponse createImageResponse421 = null;
- com.amazon.ec2.CreateImage wrappedParam = (com.amazon.ec2.CreateImage)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.CreateImage.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.CreateImage wrappedParam =
+ (com.amazon.ec2.CreateImage)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateImage.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
createImageResponse421 =
- skel.createImage(wrappedParam);
+ skel.createImage(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), createImageResponse421, false);
} else
@@ -930,12 +991,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("enableVgwRoutePropagation".equals(methodName)) {
com.amazon.ec2.EnableVgwRoutePropagationResponse enableVgwRoutePropagationResponse423 = null;
- com.amazon.ec2.EnableVgwRoutePropagation wrappedParam = (com.amazon.ec2.EnableVgwRoutePropagation)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.EnableVgwRoutePropagation.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.EnableVgwRoutePropagation wrappedParam =
+ (com.amazon.ec2.EnableVgwRoutePropagation)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.ec2.EnableVgwRoutePropagation.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
enableVgwRoutePropagationResponse423 =
- skel.enableVgwRoutePropagation(wrappedParam);
+ skel.enableVgwRoutePropagation(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), enableVgwRoutePropagationResponse423, false);
} else
@@ -943,12 +1005,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("unassignPrivateIpAddresses".equals(methodName)) {
com.amazon.ec2.UnassignPrivateIpAddressesResponse unassignPrivateIpAddressesResponse425 = null;
- com.amazon.ec2.UnassignPrivateIpAddresses wrappedParam = (com.amazon.ec2.UnassignPrivateIpAddresses)fromOM(
- msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.UnassignPrivateIpAddresses.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.UnassignPrivateIpAddresses wrappedParam =
+ (com.amazon.ec2.UnassignPrivateIpAddresses)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.ec2.UnassignPrivateIpAddresses.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
unassignPrivateIpAddressesResponse425 =
- skel.unassignPrivateIpAddresses(wrappedParam);
+ skel.unassignPrivateIpAddresses(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), unassignPrivateIpAddressesResponse425, false);
} else
@@ -956,12 +1019,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("deregisterImage".equals(methodName)) {
com.amazon.ec2.DeregisterImageResponse deregisterImageResponse427 = null;
- com.amazon.ec2.DeregisterImage wrappedParam = (com.amazon.ec2.DeregisterImage)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DeregisterImage.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DeregisterImage wrappedParam =
+ (com.amazon.ec2.DeregisterImage)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeregisterImage.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
deregisterImageResponse427 =
- skel.deregisterImage(wrappedParam);
+ skel.deregisterImage(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), deregisterImageResponse427, false);
} else
@@ -969,12 +1033,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("deleteVpnConnectionRoute".equals(methodName)) {
com.amazon.ec2.DeleteVpnConnectionRouteResponse deleteVpnConnectionRouteResponse429 = null;
- com.amazon.ec2.DeleteVpnConnectionRoute wrappedParam = (com.amazon.ec2.DeleteVpnConnectionRoute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DeleteVpnConnectionRoute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.DeleteVpnConnectionRoute wrappedParam =
+ (com.amazon.ec2.DeleteVpnConnectionRoute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
+ com.amazon.ec2.DeleteVpnConnectionRoute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
deleteVpnConnectionRouteResponse429 =
- skel.deleteVpnConnectionRoute(wrappedParam);
+ skel.deleteVpnConnectionRoute(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), deleteVpnConnectionRouteResponse429, false);
} else
@@ -982,12 +1047,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("modifyImageAttribute".equals(methodName)) {
com.amazon.ec2.ModifyImageAttributeResponse modifyImageAttributeResponse431 = null;
- com.amazon.ec2.ModifyImageAttribute wrappedParam = (com.amazon.ec2.ModifyImageAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.ModifyImageAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.ModifyImageAttribute wrappedParam =
+ (com.amazon.ec2.ModifyImageAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ModifyImageAttribute.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
modifyImageAttributeResponse431 =
- skel.modifyImageAttribute(wrappedParam);
+ skel.modifyImageAttribute(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), modifyImageAttributeResponse431, false);
} else
@@ -995,12 +1061,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("cancelConversionTask".equals(methodName)) {
com.amazon.ec2.CancelConversionTaskResponse cancelConversionTaskResponse433 = null;
- com.amazon.ec2.CancelConversionTask wrappedParam = (com.amazon.ec2.CancelConversionTask)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.CancelConversionTask.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
+ com.amazon.ec2.CancelConversionTask wrappedParam =
+ (com.amazon.ec2.CancelConversionTask)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CancelConversionTask.class,
+ getEnvelopeNamespaces(msgContext.getEnvelope()));
cancelConversionTaskResponse433 =
- skel.cancelConversionTask(wrappedParam);
+ skel.cancelConversionTask(wrappedParam);
envelope = toEnvelope(getSOAPFactory(msgContext), cancelConversionTaskResponse433, false);
} else
@@ -1008,12 +1075,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab
if ("describeVolumes".equals(methodName)) {
com.amazon.ec2.DescribeVolumesResponse describeVolumesResponse435 = null;
- com.amazon.ec2.DescribeVolumes wrappedParam = (com.amazon.ec2.DescribeVolumes)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
- com.amazon.ec2.DescribeVolumes.class, getEnvelopeNam
<TRUNCATED>
[03/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
index a44b878..de5a370 100755
--- a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
+++ b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
@@ -27,18 +27,17 @@ import java.util.Map;
import javax.ejb.Local;
import javax.inject.Inject;
-import com.cloud.dc.ClusterDetailsDao;
-import com.cloud.dc.ClusterDetailsVO;
-import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
-import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+
import com.cloud.capacity.Capacity;
import com.cloud.capacity.CapacityVO;
+import com.cloud.dc.ClusterDetailsDao;
import com.cloud.storage.Storage;
import com.cloud.utils.Pair;
-import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.JoinBuilder.JoinType;
@@ -55,11 +54,15 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
private static final Logger s_logger = Logger.getLogger(CapacityDaoImpl.class);
private static final String ADD_ALLOCATED_SQL = "UPDATE `cloud`.`op_host_capacity` SET used_capacity = used_capacity + ? WHERE host_id = ? AND capacity_type = ?";
- private static final String SUBTRACT_ALLOCATED_SQL = "UPDATE `cloud`.`op_host_capacity` SET used_capacity = used_capacity - ? WHERE host_id = ? AND capacity_type = ?";
+ private static final String SUBTRACT_ALLOCATED_SQL =
+ "UPDATE `cloud`.`op_host_capacity` SET used_capacity = used_capacity - ? WHERE host_id = ? AND capacity_type = ?";
- private static final String LIST_CLUSTERSINZONE_BY_HOST_CAPACITIES_PART1 = "SELECT DISTINCT capacity.cluster_id FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster` cluster on (cluster.id = capacity.cluster_id AND cluster.removed is NULL) INNER JOIN `cloud`.`cluster_details` cluster_details ON (cluster.id = cluster_details.cluster_id ) WHERE ";
- private static final String LIST_CLUSTERSINZONE_BY_HOST_CAPACITIES_PART2 = " AND capacity_type = ? AND cluster_details.name= ? AND ((total_capacity * cluster_details.value ) - used_capacity + reserved_capacity) >= ? AND capacity.cluster_id IN (SELECT distinct capacity.cluster_id FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id = cluster_details.cluster_id ) WHERE ";
- private static final String LIST_CLUSTERSINZONE_BY_HOST_CAPACITIES_PART3 = " AND capacity_type = ? AND cluster_details.name= ? AND ((total_capacity * cluster_details.value) - used_capacity + reserved_capacity) >= ?) ";
+ private static final String LIST_CLUSTERSINZONE_BY_HOST_CAPACITIES_PART1 =
+ "SELECT DISTINCT capacity.cluster_id FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster` cluster on (cluster.id = capacity.cluster_id AND cluster.removed is NULL) INNER JOIN `cloud`.`cluster_details` cluster_details ON (cluster.id = cluster_details.cluster_id ) WHERE ";
+ private static final String LIST_CLUSTERSINZONE_BY_HOST_CAPACITIES_PART2 =
+ " AND capacity_type = ? AND cluster_details.name= ? AND ((total_capacity * cluster_details.value ) - used_capacity + reserved_capacity) >= ? AND capacity.cluster_id IN (SELECT distinct capacity.cluster_id FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id = cluster_details.cluster_id ) WHERE ";
+ private static final String LIST_CLUSTERSINZONE_BY_HOST_CAPACITIES_PART3 =
+ " AND capacity_type = ? AND cluster_details.name= ? AND ((total_capacity * cluster_details.value) - used_capacity + reserved_capacity) >= ?) ";
private final SearchBuilder<CapacityVO> _hostIdTypeSearch;
private final SearchBuilder<CapacityVO> _hostOrPoolIdSearch;
@@ -69,65 +72,78 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
@Inject
protected ClusterDetailsDao _clusterDetailsDao;
- private static final String LIST_HOSTS_IN_CLUSTER_WITH_ENOUGH_CAPACITY = " SELECT host_capacity.host_id FROM (`cloud`.`host` JOIN `cloud`.`op_host_capacity` host_capacity ON (host.id = host_capacity.host_id AND host.cluster_id = ?) JOIN `cloud`.`cluster_details` cluster_details ON (host_capacity.cluster_id = cluster_details.cluster_id) AND host.type = ? AND cluster_details.name='cpuOvercommitRatio' AND ((host_capacity.total_capacity *cluster_details.value ) - host_capacity.used_capacity) >= ? and host_capacity.capacity_type = '1' "
- + " AND host_capacity.host_id IN (SELECT capacity.host_id FROM `cloud`.`op_host_capacity` capacity JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id= cluster_details.cluster_id) where capacity_type='0' AND cluster_details.name='memoryOvercommitRatio' AND ((total_capacity* cluster_details.value) - used_capacity ) >= ?)) ";
+ private static final String LIST_HOSTS_IN_CLUSTER_WITH_ENOUGH_CAPACITY =
+ " SELECT host_capacity.host_id FROM (`cloud`.`host` JOIN `cloud`.`op_host_capacity` host_capacity ON (host.id = host_capacity.host_id AND host.cluster_id = ?) JOIN `cloud`.`cluster_details` cluster_details ON (host_capacity.cluster_id = cluster_details.cluster_id) AND host.type = ? AND cluster_details.name='cpuOvercommitRatio' AND ((host_capacity.total_capacity *cluster_details.value ) - host_capacity.used_capacity) >= ? and host_capacity.capacity_type = '1' "
+ + " AND host_capacity.host_id IN (SELECT capacity.host_id FROM `cloud`.`op_host_capacity` capacity JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id= cluster_details.cluster_id) where capacity_type='0' AND cluster_details.name='memoryOvercommitRatio' AND ((total_capacity* cluster_details.value) - used_capacity ) >= ?)) ";
- private static final String ORDER_CLUSTERS_BY_AGGREGATE_CAPACITY_PART1 = "SELECT capacity.cluster_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity ) FROM `cloud`.`op_host_capacity` capacity WHERE ";
+ private static final String ORDER_CLUSTERS_BY_AGGREGATE_CAPACITY_PART1 =
+ "SELECT capacity.cluster_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity ) FROM `cloud`.`op_host_capacity` capacity WHERE ";
- private static final String ORDER_CLUSTERS_BY_AGGREGATE_CAPACITY_PART2 = " AND capacity_type = ? AND cluster_details.name =? GROUP BY capacity.cluster_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) ASC";
+ private static final String ORDER_CLUSTERS_BY_AGGREGATE_CAPACITY_PART2 =
+ " AND capacity_type = ? AND cluster_details.name =? GROUP BY capacity.cluster_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) ASC";
- private static final String ORDER_CLUSTERS_BY_AGGREGATE_OVERCOMMIT_CAPACITY_PART1 = "SELECT capacity.cluster_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id = cluster_details.cluster_id) WHERE ";
+ private static final String ORDER_CLUSTERS_BY_AGGREGATE_OVERCOMMIT_CAPACITY_PART1 =
+ "SELECT capacity.cluster_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id = cluster_details.cluster_id) WHERE ";
- private static final String ORDER_CLUSTERS_BY_AGGREGATE_OVERCOMMIT_CAPACITY_PART2 = " AND capacity_type = ? AND cluster_details.name =? GROUP BY capacity.cluster_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) ASC";
+ private static final String ORDER_CLUSTERS_BY_AGGREGATE_OVERCOMMIT_CAPACITY_PART2 =
+ " AND capacity_type = ? AND cluster_details.name =? GROUP BY capacity.cluster_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) ASC";
- private static final String LIST_PODSINZONE_BY_HOST_CAPACITY_TYPE = "SELECT DISTINCT capacity.pod_id FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`host_pod_ref` pod "
- + " ON (pod.id = capacity.pod_id AND pod.removed is NULL) INNER JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id = cluster_details.cluster_id ) WHERE capacity.data_center_id = ? AND capacity_type = ? AND cluster_details.name= ? AND ((total_capacity * cluster_details.value ) - used_capacity + reserved_capacity) >= ? ";
+ private static final String LIST_PODSINZONE_BY_HOST_CAPACITY_TYPE =
+ "SELECT DISTINCT capacity.pod_id FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`host_pod_ref` pod "
+ + " ON (pod.id = capacity.pod_id AND pod.removed is NULL) INNER JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id = cluster_details.cluster_id ) WHERE capacity.data_center_id = ? AND capacity_type = ? AND cluster_details.name= ? AND ((total_capacity * cluster_details.value ) - used_capacity + reserved_capacity) >= ? ";
- private static final String ORDER_PODS_BY_AGGREGATE_CAPACITY = " SELECT capacity.pod_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity) FROM `cloud`.`op_host_capacity` capacity WHERE data_center_id= ? AND capacity_type = ? GROUP BY capacity.pod_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity) ASC ";
+ private static final String ORDER_PODS_BY_AGGREGATE_CAPACITY =
+ " SELECT capacity.pod_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity) FROM `cloud`.`op_host_capacity` capacity WHERE data_center_id= ? AND capacity_type = ? GROUP BY capacity.pod_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity) ASC ";
- private static final String ORDER_PODS_BY_AGGREGATE_OVERCOMMIT_CAPACITY = "SELECT capacity.pod_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id = cluster_details.cluster_id) WHERE data_center_id=? AND capacity_type = ? AND cluster_details.name = ? GROUP BY capacity.pod_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) ASC";
+ private static final String ORDER_PODS_BY_AGGREGATE_OVERCOMMIT_CAPACITY =
+ "SELECT capacity.pod_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id = cluster_details.cluster_id) WHERE data_center_id=? AND capacity_type = ? AND cluster_details.name = ? GROUP BY capacity.pod_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) ASC";
- private static final String LIST_CAPACITY_BY_RESOURCE_STATE = "SELECT capacity.data_center_id, sum(capacity.used_capacity), sum(capacity.reserved_quantity), sum(capacity.total_capacity), capacity_capacity_type "
- + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`data_center` dc ON (dc.id = capacity.data_center_id AND dc.removed is NULL)"
- + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`host_pod_ref` pod ON (pod.id = capacity.pod_id AND pod.removed is NULL)"
- + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster` cluster ON (cluster.id = capacity.cluster_id AND cluster.removed is NULL)"
- + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`host` host ON (host.id = capacity.host_id AND host.removed is NULL)"
- + "WHERE dc.allocation_state = ? AND pod.allocation_state = ? AND cluster.allocation_state = ? AND host.resource_state = ? AND capacity_type not in (3,4) ";
+ private static final String LIST_CAPACITY_BY_RESOURCE_STATE =
+ "SELECT capacity.data_center_id, sum(capacity.used_capacity), sum(capacity.reserved_quantity), sum(capacity.total_capacity), capacity_capacity_type "
+ + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`data_center` dc ON (dc.id = capacity.data_center_id AND dc.removed is NULL)"
+ + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`host_pod_ref` pod ON (pod.id = capacity.pod_id AND pod.removed is NULL)"
+ + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster` cluster ON (cluster.id = capacity.cluster_id AND cluster.removed is NULL)"
+ + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`host` host ON (host.id = capacity.host_id AND host.removed is NULL)"
+ + "WHERE dc.allocation_state = ? AND pod.allocation_state = ? AND cluster.allocation_state = ? AND host.resource_state = ? AND capacity_type not in (3,4) ";
- private static final String LIST_CAPACITY_GROUP_BY_ZONE_TYPE_PART1 = "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity),"
- + " (case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))"
- + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))"
- + "else sum(total_capacity) end),"
- + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) / ( case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))"
- + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name='memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end)) percent,"
- + "capacity.capacity_type, capacity.data_center_id FROM `cloud`.`op_host_capacity` capacity WHERE total_capacity > 0 AND data_center_id is not null AND capacity_state='Enabled'";
+ private static final String LIST_CAPACITY_GROUP_BY_ZONE_TYPE_PART1 =
+ "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity),"
+ + " (case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))"
+ + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))"
+ + "else sum(total_capacity) end),"
+ + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) / ( case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))"
+ + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name='memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end)) percent,"
+ + "capacity.capacity_type, capacity.data_center_id FROM `cloud`.`op_host_capacity` capacity WHERE total_capacity > 0 AND data_center_id is not null AND capacity_state='Enabled'";
private static final String LIST_CAPACITY_GROUP_BY_ZONE_TYPE_PART2 = " GROUP BY data_center_id, capacity_type order by percent desc limit ";
- private static final String LIST_CAPACITY_GROUP_BY_POD_TYPE_PART1 = "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity),"
- + " (case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) "
- + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end),"
- + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) / ( case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) "
- + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end)) percent,"
- + "capacity.capacity_type, capacity.data_center_id, pod_id FROM `cloud`.`op_host_capacity` capacity WHERE total_capacity > 0 AND data_center_id is not null AND capacity_state='Enabled' ";
+ private static final String LIST_CAPACITY_GROUP_BY_POD_TYPE_PART1 =
+ "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity),"
+ + " (case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) "
+ + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end),"
+ + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) / ( case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) "
+ + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end)) percent,"
+ + "capacity.capacity_type, capacity.data_center_id, pod_id FROM `cloud`.`op_host_capacity` capacity WHERE total_capacity > 0 AND data_center_id is not null AND capacity_state='Enabled' ";
private static final String LIST_CAPACITY_GROUP_BY_POD_TYPE_PART2 = " GROUP BY pod_id, capacity_type order by percent desc limit ";
- private static final String LIST_CAPACITY_GROUP_BY_CLUSTER_TYPE_PART1 = "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity),"
- + " (case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) "
- + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end),"
- + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) / ( case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) "
- + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end)) percent,"
- + "capacity.capacity_type, capacity.data_center_id, pod_id, cluster_id FROM `cloud`.`op_host_capacity` capacity WHERE total_capacity > 0 AND data_center_id is not null AND capacity_state='Enabled' ";
+ private static final String LIST_CAPACITY_GROUP_BY_CLUSTER_TYPE_PART1 =
+ "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity),"
+ + " (case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) "
+ + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end),"
+ + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) / ( case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) "
+ + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end)) percent,"
+ + "capacity.capacity_type, capacity.data_center_id, pod_id, cluster_id FROM `cloud`.`op_host_capacity` capacity WHERE total_capacity > 0 AND data_center_id is not null AND capacity_state='Enabled' ";
private static final String LIST_CAPACITY_GROUP_BY_CLUSTER_TYPE_PART2 = " GROUP BY cluster_id, capacity_type order by percent desc limit ";
private static final String UPDATE_CAPACITY_STATE = "UPDATE `cloud`.`op_host_capacity` SET capacity_state = ? WHERE ";
- private static final String LIST_CAPACITY_GROUP_BY_CAPACITY_PART1 = "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity),"
- + " (case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) "
- + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end),"
- + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) / ( case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) "
- + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) else sum(total_capacity) end)) percent,"
- + "capacity.capacity_type, capacity.data_center_id, pod_id FROM `cloud`.`op_host_capacity` capacity WHERE total_capacity > 0 AND data_center_id is not null AND capacity_state='Enabled' ";
+ private static final String LIST_CAPACITY_GROUP_BY_CAPACITY_PART1 =
+ "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity),"
+ + " (case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) "
+ + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end),"
+ + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) / ( case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) "
+ + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) else sum(total_capacity) end)) percent,"
+ + "capacity.capacity_type, capacity.data_center_id, pod_id FROM `cloud`.`op_host_capacity` capacity WHERE total_capacity > 0 AND data_center_id is not null AND capacity_state='Enabled' ";
private static final String LIST_CAPACITY_GROUP_BY_CAPACITY_PART2 = " GROUP BY capacity_type";
@@ -145,20 +161,19 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
* query from the configuration table
*
* */
- private static final String LIST_CLUSTERS_CROSSING_THRESHOLD = "SELECT clusterList.cluster_id "
- + "FROM ( SELECT cluster.cluster_id cluster_id, ( (sum(cluster.used) + sum(cluster.reserved) + ?)/sum(cluster.total) ) ratio, cluster.configValue value "
- + "FROM ( SELECT capacity.cluster_id cluster_id, capacity.used_capacity used, capacity.reserved_capacity reserved, capacity.total_capacity * overcommit.value total, "
- + "CASE (SELECT count(*) FROM `cloud`.`cluster_details` details WHERE details.cluster_id = capacity.cluster_id AND details.name = ? ) "
- + "WHEN 1 THEN ( CASE WHEN (SELECT details.value FROM `cloud`.`cluster_details` details WHERE details.cluster_id = capacity.cluster_id AND details.name = ?) is NULL "
- + "THEN (SELECT config.value FROM `cloud`.`configuration` config WHERE config.name = ?)"
- + "ELSE (SELECT details.value FROM `cloud`.`cluster_details` details WHERE details.cluster_id = capacity.cluster_id AND details.name = ? ) END )"
- + "ELSE ( SELECT config.value FROM `cloud`.`configuration` config WHERE config.name = ?) "
- + "END configValue "
- + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details` overcommit ON overcommit.cluster_id = capacity.cluster_id "
- + "WHERE capacity.data_center_id = ? AND capacity.capacity_type = ? AND capacity.total_capacity > 0 AND overcommit.name = ?) cluster "
- +
-
- "GROUP BY cluster.cluster_id) clusterList " + "WHERE clusterList.ratio > clusterList.value; ";
+ private static final String LIST_CLUSTERS_CROSSING_THRESHOLD =
+ "SELECT clusterList.cluster_id "
+ + "FROM ( SELECT cluster.cluster_id cluster_id, ( (sum(cluster.used) + sum(cluster.reserved) + ?)/sum(cluster.total) ) ratio, cluster.configValue value "
+ + "FROM ( SELECT capacity.cluster_id cluster_id, capacity.used_capacity used, capacity.reserved_capacity reserved, capacity.total_capacity * overcommit.value total, "
+ + "CASE (SELECT count(*) FROM `cloud`.`cluster_details` details WHERE details.cluster_id = capacity.cluster_id AND details.name = ? ) "
+ + "WHEN 1 THEN ( CASE WHEN (SELECT details.value FROM `cloud`.`cluster_details` details WHERE details.cluster_id = capacity.cluster_id AND details.name = ?) is NULL "
+ + "THEN (SELECT config.value FROM `cloud`.`configuration` config WHERE config.name = ?)"
+ + "ELSE (SELECT details.value FROM `cloud`.`cluster_details` details WHERE details.cluster_id = capacity.cluster_id AND details.name = ? ) END )"
+ + "ELSE ( SELECT config.value FROM `cloud`.`configuration` config WHERE config.name = ?) " + "END configValue "
+ + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details` overcommit ON overcommit.cluster_id = capacity.cluster_id "
+ + "WHERE capacity.data_center_id = ? AND capacity.capacity_type = ? AND capacity.total_capacity > 0 AND overcommit.name = ?) cluster " +
+
+ "GROUP BY cluster.cluster_id) clusterList " + "WHERE clusterList.ratio > clusterList.value; ";
public CapacityDaoImpl() {
_hostIdTypeSearch = createSearchBuilder();
@@ -358,8 +373,8 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
if (level == 3 && rs.getLong(7) != 0)
capacityClusterId = rs.getLong(7);
- SummedCapacity summedCapacity = new SummedCapacity(rs.getLong(1), rs.getLong(2), rs.getLong(3), rs.getFloat(4), (short)rs.getLong(5), rs.getLong(6), capacityPodId,
- capacityClusterId);
+ SummedCapacity summedCapacity =
+ new SummedCapacity(rs.getLong(1), rs.getLong(2), rs.getLong(3), rs.getFloat(4), (short)rs.getLong(5), rs.getLong(6), capacityPodId, capacityClusterId);
result.add(summedCapacity);
}
@@ -475,11 +490,11 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
try {
pstmt = txn.prepareAutoCloseStatement(sql.toString());
pstmt.setLong(1, id);
- pstmt.setShort(2, CapacityVO.CAPACITY_TYPE_CPU);
+ pstmt.setShort(2, Capacity.CAPACITY_TYPE_CPU);
pstmt.setString(3, "cpuOvercommitRatio");
pstmt.setLong(4, requiredCpu);
pstmt.setLong(5, id);
- pstmt.setShort(6, CapacityVO.CAPACITY_TYPE_MEMORY);
+ pstmt.setShort(6, Capacity.CAPACITY_TYPE_MEMORY);
pstmt.setString(7, "memoryOvercommitRatio");
pstmt.setLong(8, requiredRam);
@@ -652,7 +667,8 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
SearchBuilder<StoragePoolVO> nonSharedStorage = _storagePoolDao.createSearchBuilder();
nonSharedStorage.and("poolTypes", nonSharedStorage.entity().getPoolType(), SearchCriteria.Op.IN);
- SummedCapacitySearch.join("nonSharedStorage", nonSharedStorage, nonSharedStorage.entity().getId(), SummedCapacitySearch.entity().getHostOrPoolId(), JoinType.INNER);
+ SummedCapacitySearch.join("nonSharedStorage", nonSharedStorage, nonSharedStorage.entity().getId(), SummedCapacitySearch.entity().getHostOrPoolId(),
+ JoinType.INNER);
nonSharedStorage.done();
if (zoneId != null) {
@@ -772,11 +788,11 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
try {
pstmt = txn.prepareAutoCloseStatement(sql.toString());
pstmt.setLong(1, zoneId);
- pstmt.setShort(2, CapacityVO.CAPACITY_TYPE_CPU);
+ pstmt.setShort(2, Capacity.CAPACITY_TYPE_CPU);
pstmt.setString(3, "cpuOvercommitRatio");
pstmt.setLong(4, requiredCpu);
pstmt.setLong(5, zoneId);
- pstmt.setShort(6, CapacityVO.CAPACITY_TYPE_MEMORY);
+ pstmt.setShort(6, Capacity.CAPACITY_TYPE_MEMORY);
pstmt.setString(7, "memoryOvercommitRatio");
pstmt.setLong(8, requiredRam);
@@ -800,15 +816,15 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
Map<Long, Double> podCapacityMap = new HashMap<Long, Double>();
StringBuilder sql = null;
try {
- if (capacityTypeForOrdering == CapacityVO.CAPACITY_TYPE_CPU | capacityTypeForOrdering == CapacityVO.CAPACITY_TYPE_MEMORY) {
+ if (capacityTypeForOrdering == Capacity.CAPACITY_TYPE_CPU | capacityTypeForOrdering == Capacity.CAPACITY_TYPE_MEMORY) {
sql = new StringBuilder(ORDER_PODS_BY_AGGREGATE_OVERCOMMIT_CAPACITY);
pstmt = txn.prepareAutoCloseStatement(sql.toString());
pstmt.setLong(1, zoneId);
pstmt.setShort(2, capacityTypeForOrdering);
- if (capacityTypeForOrdering == CapacityVO.CAPACITY_TYPE_CPU) {
+ if (capacityTypeForOrdering == Capacity.CAPACITY_TYPE_CPU) {
pstmt.setString(3, "cpuOvercommitRatio");
- } else if (capacityTypeForOrdering == CapacityVO.CAPACITY_TYPE_MEMORY) {
+ } else if (capacityTypeForOrdering == Capacity.CAPACITY_TYPE_MEMORY) {
pstmt.setString(3, "memoryOvercommitRatio");
}
} else {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/certificate/CertificateVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/certificate/CertificateVO.java b/engine/schema/src/com/cloud/certificate/CertificateVO.java
index 1b42ffd..11bf8e8 100644
--- a/engine/schema/src/com/cloud/certificate/CertificateVO.java
+++ b/engine/schema/src/com/cloud/certificate/CertificateVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.certificate;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = "certificate")
public class CertificateVO implements InternalIdentity {
@@ -43,6 +43,7 @@ public class CertificateVO implements InternalIdentity {
public CertificateVO() {
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/cluster/agentlb/HostTransferMapVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/cluster/agentlb/HostTransferMapVO.java b/engine/schema/src/com/cloud/cluster/agentlb/HostTransferMapVO.java
index b307589..8d28b8e 100644
--- a/engine/schema/src/com/cloud/cluster/agentlb/HostTransferMapVO.java
+++ b/engine/schema/src/com/cloud/cluster/agentlb/HostTransferMapVO.java
@@ -25,9 +25,10 @@ import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
-import com.cloud.utils.db.GenericDao;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.utils.db.GenericDao;
+
@Entity
@Table(name = "op_host_transfer")
@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
@@ -87,6 +88,7 @@ public class HostTransferMapVO implements InternalIdentity {
this.state = state;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/configuration/ResourceCountVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/configuration/ResourceCountVO.java b/engine/schema/src/com/cloud/configuration/ResourceCountVO.java
index 0f959df..ae8f382 100644
--- a/engine/schema/src/com/cloud/configuration/ResourceCountVO.java
+++ b/engine/schema/src/com/cloud/configuration/ResourceCountVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.configuration;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/configuration/ResourceLimitVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/configuration/ResourceLimitVO.java b/engine/schema/src/com/cloud/configuration/ResourceLimitVO.java
index c131495..3921709 100644
--- a/engine/schema/src/com/cloud/configuration/ResourceLimitVO.java
+++ b/engine/schema/src/com/cloud/configuration/ResourceLimitVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.configuration;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java b/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java
index 4740fea..be429b5 100644
--- a/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java
+++ b/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java
@@ -32,10 +32,8 @@ import com.cloud.configuration.Resource.ResourceType;
import com.cloud.configuration.ResourceCountVO;
import com.cloud.configuration.ResourceLimit;
import com.cloud.domain.dao.DomainDao;
-import com.cloud.domain.dao.DomainDaoImpl;
import com.cloud.exception.UnsupportedServiceException;
import com.cloud.user.dao.AccountDao;
-import com.cloud.user.dao.AccountDaoImpl;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/AccountVlanMapVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/AccountVlanMapVO.java b/engine/schema/src/com/cloud/dc/AccountVlanMapVO.java
index f01d362..6461a96 100644
--- a/engine/schema/src/com/cloud/dc/AccountVlanMapVO.java
+++ b/engine/schema/src/com/cloud/dc/AccountVlanMapVO.java
@@ -23,9 +23,10 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import com.cloud.user.OwnedBy;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.user.OwnedBy;
+
@Entity
@Table(name = "account_vlan_map")
public class AccountVlanMapVO implements OwnedBy, InternalIdentity {
@@ -50,6 +51,7 @@ public class AccountVlanMapVO implements OwnedBy, InternalIdentity {
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/ClusterDetailsVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/ClusterDetailsVO.java b/engine/schema/src/com/cloud/dc/ClusterDetailsVO.java
index 9de85b5..6eb9e74 100644
--- a/engine/schema/src/com/cloud/dc/ClusterDetailsVO.java
+++ b/engine/schema/src/com/cloud/dc/ClusterDetailsVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.dc;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = "cluster_details")
public class ClusterDetailsVO implements InternalIdentity {
@@ -68,6 +68,7 @@ public class ClusterDetailsVO implements InternalIdentity {
this.value = value;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/ClusterVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/ClusterVO.java b/engine/schema/src/com/cloud/dc/ClusterVO.java
index af0cace..b701542 100644
--- a/engine/schema/src/com/cloud/dc/ClusterVO.java
+++ b/engine/schema/src/com/cloud/dc/ClusterVO.java
@@ -28,14 +28,12 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import org.apache.cloudstack.api.Identity;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.org.Cluster;
-import com.cloud.org.Managed.ManagedState;
import com.cloud.org.Grouping;
+import com.cloud.org.Managed.ManagedState;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.db.GenericDao;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = "cluster")
@@ -96,22 +94,27 @@ public class ClusterVO implements Cluster {
this.uuid = UUID.randomUUID().toString();
}
+ @Override
public long getId() {
return id;
}
+ @Override
public String getName() {
return name;
}
+ @Override
public long getDataCenterId() {
return dataCenterId;
}
+ @Override
public long getPodId() {
return podId;
}
+ @Override
public Cluster.ClusterType getClusterType() {
return clusterType;
}
@@ -120,6 +123,7 @@ public class ClusterVO implements Cluster {
this.clusterType = clusterType;
}
+ @Override
public AllocationState getAllocationState() {
return allocationState;
}
@@ -128,6 +132,7 @@ public class ClusterVO implements Cluster {
this.allocationState = allocationState;
}
+ @Override
public ManagedState getManagedState() {
return managedState;
}
@@ -154,6 +159,7 @@ public class ClusterVO implements Cluster {
return this.id == that.id;
}
+ @Override
public HypervisorType getHypervisorType() {
return HypervisorType.getType(hypervisorType);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/DataCenterIpAddressVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/DataCenterIpAddressVO.java b/engine/schema/src/com/cloud/dc/DataCenterIpAddressVO.java
index 6b9d866..70b4df1 100755
--- a/engine/schema/src/com/cloud/dc/DataCenterIpAddressVO.java
+++ b/engine/schema/src/com/cloud/dc/DataCenterIpAddressVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.dc;
-import org.apache.cloudstack.api.InternalIdentity;
-
import java.util.Date;
import javax.persistence.Column;
@@ -29,6 +27,8 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = "op_dc_ip_address_alloc")
public class DataCenterIpAddressVO implements InternalIdentity {
@@ -77,6 +77,7 @@ public class DataCenterIpAddressVO implements InternalIdentity {
this.podId = podId;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/DataCenterLinkLocalIpAddressVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/DataCenterLinkLocalIpAddressVO.java b/engine/schema/src/com/cloud/dc/DataCenterLinkLocalIpAddressVO.java
index 2f6d96d..31d124c 100644
--- a/engine/schema/src/com/cloud/dc/DataCenterLinkLocalIpAddressVO.java
+++ b/engine/schema/src/com/cloud/dc/DataCenterLinkLocalIpAddressVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.dc;
-import org.apache.cloudstack.api.InternalIdentity;
-
import java.util.Date;
import javax.persistence.Column;
@@ -29,6 +27,8 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = "op_dc_link_local_ip_address_alloc")
public class DataCenterLinkLocalIpAddressVO implements InternalIdentity {
@@ -66,6 +66,7 @@ public class DataCenterLinkLocalIpAddressVO implements InternalIdentity {
this.podId = podId;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/DataCenterVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/DataCenterVO.java b/engine/schema/src/com/cloud/dc/DataCenterVO.java
index b81273b..02aa988 100644
--- a/engine/schema/src/com/cloud/dc/DataCenterVO.java
+++ b/engine/schema/src/com/cloud/dc/DataCenterVO.java
@@ -31,12 +31,10 @@ import javax.persistence.Table;
import javax.persistence.TableGenerator;
import javax.persistence.Transient;
-import org.apache.cloudstack.api.Identity;
import com.cloud.network.Network.Provider;
import com.cloud.org.Grouping;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.db.GenericDao;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = "data_center")
@@ -190,8 +188,8 @@ public class DataCenterVO implements DataCenter {
this.uuid = UUID.randomUUID().toString();
}
- public DataCenterVO(String name, String description, String dns1, String dns2, String dns3, String dns4, String guestCidr, String domain, Long domainId, NetworkType zoneType,
- String zoneToken, String domainSuffix, boolean securityGroupEnabled, boolean localStorageEnabled, String ip6Dns1, String ip6Dns2) {
+ public DataCenterVO(String name, String description, String dns1, String dns2, String dns3, String dns4, String guestCidr, String domain, Long domainId,
+ NetworkType zoneType, String zoneToken, String domainSuffix, boolean securityGroupEnabled, boolean localStorageEnabled, String ip6Dns1, String ip6Dns2) {
this.name = name;
this.description = description;
this.dns1 = dns1;
@@ -388,6 +386,7 @@ public class DataCenterVO implements DataCenter {
details.put(name, value);
}
+ @Override
public AllocationState getAllocationState() {
return allocationState;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/DataCenterVnetVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/DataCenterVnetVO.java b/engine/schema/src/com/cloud/dc/DataCenterVnetVO.java
index 612a039..d3959df 100755
--- a/engine/schema/src/com/cloud/dc/DataCenterVnetVO.java
+++ b/engine/schema/src/com/cloud/dc/DataCenterVnetVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.dc;
-import org.apache.cloudstack.api.InternalIdentity;
-
import java.util.Date;
import javax.persistence.Column;
@@ -29,6 +27,8 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = "op_dc_vnet_alloc")
public class DataCenterVnetVO implements InternalIdentity {
@@ -75,6 +75,7 @@ public class DataCenterVnetVO implements InternalIdentity {
this.takenAt = null;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/HostPodVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/HostPodVO.java b/engine/schema/src/com/cloud/dc/HostPodVO.java
index f1e79f0..d997181 100644
--- a/engine/schema/src/com/cloud/dc/HostPodVO.java
+++ b/engine/schema/src/com/cloud/dc/HostPodVO.java
@@ -28,11 +28,9 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import org.apache.cloudstack.api.Identity;
import com.cloud.org.Grouping;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.db.GenericDao;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = "host_pod_ref")
@@ -96,6 +94,7 @@ public class HostPodVO implements Pod {
return id;
}
+ @Override
public long getDataCenterId() {
return dataCenterId;
}
@@ -104,6 +103,7 @@ public class HostPodVO implements Pod {
this.dataCenterId = dataCenterId;
}
+ @Override
public String getName() {
return name;
}
@@ -139,6 +139,7 @@ public class HostPodVO implements Pod {
this.gateway = gateway;
}
+ @Override
public String getDescription() {
return description;
}
@@ -147,6 +148,7 @@ public class HostPodVO implements Pod {
this.description = description;
}
+ @Override
public AllocationState getAllocationState() {
return allocationState;
}
@@ -165,6 +167,7 @@ public class HostPodVO implements Pod {
return NumbersUtil.hash(id);
}
+ @Override
public boolean getExternalDhcp() {
return externalDhcp;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/PodVlanMapVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/PodVlanMapVO.java b/engine/schema/src/com/cloud/dc/PodVlanMapVO.java
index dbbda91..5f84cf2 100644
--- a/engine/schema/src/com/cloud/dc/PodVlanMapVO.java
+++ b/engine/schema/src/com/cloud/dc/PodVlanMapVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.dc;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = "pod_vlan_map")
public class PodVlanMapVO implements InternalIdentity {
@@ -48,6 +48,7 @@ public class PodVlanMapVO implements InternalIdentity {
public PodVlanMapVO() {
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/PodVlanVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/PodVlanVO.java b/engine/schema/src/com/cloud/dc/PodVlanVO.java
index 79b8ae0..01668d9 100755
--- a/engine/schema/src/com/cloud/dc/PodVlanVO.java
+++ b/engine/schema/src/com/cloud/dc/PodVlanVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.dc;
-import org.apache.cloudstack.api.InternalIdentity;
-
import java.util.Date;
import javax.persistence.Column;
@@ -29,6 +27,8 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = "op_pod_vlan_alloc")
public class PodVlanVO implements InternalIdentity {
@@ -69,6 +69,7 @@ public class PodVlanVO implements InternalIdentity {
this.takenAt = null;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/StorageNetworkIpAddressVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/StorageNetworkIpAddressVO.java b/engine/schema/src/com/cloud/dc/StorageNetworkIpAddressVO.java
index a828205..d719142 100755
--- a/engine/schema/src/com/cloud/dc/StorageNetworkIpAddressVO.java
+++ b/engine/schema/src/com/cloud/dc/StorageNetworkIpAddressVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.dc;
-import org.apache.cloudstack.api.InternalIdentity;
-
import java.util.Date;
import javax.persistence.Column;
@@ -32,6 +30,8 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = "op_dc_storage_network_ip_address")
@SecondaryTables({@SecondaryTable(name = "dc_storage_network_ip_range", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "range_id", referencedColumnName = "id")})})
@@ -66,6 +66,7 @@ public class StorageNetworkIpAddressVO implements InternalIdentity {
protected StorageNetworkIpAddressVO() {
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/StorageNetworkIpRangeVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/StorageNetworkIpRangeVO.java b/engine/schema/src/com/cloud/dc/StorageNetworkIpRangeVO.java
index d09a26e..9b84ac7 100755
--- a/engine/schema/src/com/cloud/dc/StorageNetworkIpRangeVO.java
+++ b/engine/schema/src/com/cloud/dc/StorageNetworkIpRangeVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.dc;
-import org.apache.cloudstack.api.InternalIdentity;
-
import java.util.UUID;
import javax.persistence.Column;
@@ -33,8 +31,8 @@ import javax.persistence.Table;
@Entity
@Table(name = "dc_storage_network_ip_range")
@SecondaryTables({@SecondaryTable(name = "networks", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "network_id", referencedColumnName = "id")}),
- @SecondaryTable(name = "host_pod_ref", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "pod_id", referencedColumnName = "id")}),
- @SecondaryTable(name = "data_center", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "data_center_id", referencedColumnName = "id")})})
+ @SecondaryTable(name = "host_pod_ref", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "pod_id", referencedColumnName = "id")}),
+ @SecondaryTable(name = "data_center", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "data_center_id", referencedColumnName = "id")})})
public class StorageNetworkIpRangeVO implements StorageNetworkIpRange {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -93,6 +91,7 @@ public class StorageNetworkIpRangeVO implements StorageNetworkIpRange {
this.uuid = UUID.randomUUID().toString();
}
+ @Override
public long getId() {
return id;
}
@@ -121,6 +120,7 @@ public class StorageNetworkIpRangeVO implements StorageNetworkIpRange {
this.networkId = nwId;
}
+ @Override
public Integer getVlan() {
return vlan;
}
@@ -133,6 +133,7 @@ public class StorageNetworkIpRangeVO implements StorageNetworkIpRange {
this.startIp = start;
}
+ @Override
public String getStartIp() {
return startIp;
}
@@ -141,14 +142,17 @@ public class StorageNetworkIpRangeVO implements StorageNetworkIpRange {
this.endIp = end;
}
+ @Override
public String getEndIp() {
return endIp;
}
+ @Override
public String getNetmask() {
return netmask;
}
+ @Override
public String getGateway() {
return this.gateway;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/VlanVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/VlanVO.java b/engine/schema/src/com/cloud/dc/VlanVO.java
index 1061c90..ff103b9 100644
--- a/engine/schema/src/com/cloud/dc/VlanVO.java
+++ b/engine/schema/src/com/cloud/dc/VlanVO.java
@@ -27,9 +27,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import org.apache.cloudstack.api.Identity;
-import org.apache.cloudstack.api.InternalIdentity;
-
@Entity
@Table(name = "vlan")
public class VlanVO implements Vlan {
@@ -167,23 +164,24 @@ public class VlanVO implements Vlan {
@Override
public String toString() {
if (toString == null) {
- toString = new StringBuilder("Vlan[").append(vlanTag)
- .append("|")
- .append(vlanGateway)
- .append("|")
- .append(vlanNetmask)
- .append("|")
- .append(ip6Gateway)
- .append("|")
- .append(ip6Cidr)
- .append("|")
- .append(ipRange)
- .append("|")
- .append("|")
- .append(ip6Range)
- .append(networkId)
- .append("]")
- .toString();
+ toString =
+ new StringBuilder("Vlan[").append(vlanTag)
+ .append("|")
+ .append(vlanGateway)
+ .append("|")
+ .append(vlanNetmask)
+ .append("|")
+ .append(ip6Gateway)
+ .append("|")
+ .append(ip6Cidr)
+ .append("|")
+ .append(ipRange)
+ .append("|")
+ .append("|")
+ .append(ip6Range)
+ .append(networkId)
+ .append("]")
+ .toString();
}
return toString;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/dao/ClusterDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/ClusterDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/ClusterDaoImpl.java
index 17c7785..c0f86f3 100644
--- a/engine/schema/src/com/cloud/dc/dao/ClusterDaoImpl.java
+++ b/engine/schema/src/com/cloud/dc/dao/ClusterDaoImpl.java
@@ -223,7 +223,8 @@ public class ClusterDaoImpl extends GenericDaoBase<ClusterVO, Long> implements C
GenericSearchBuilder<ClusterVO, Long> clusterIdSearch = createSearchBuilder(Long.class);
clusterIdSearch.selectFields(clusterIdSearch.entity().getId());
- clusterIdSearch.join("disabledPodIdSearch", disabledPodIdSearch, clusterIdSearch.entity().getPodId(), disabledPodIdSearch.entity().getId(), JoinBuilder.JoinType.INNER);
+ clusterIdSearch.join("disabledPodIdSearch", disabledPodIdSearch, clusterIdSearch.entity().getPodId(), disabledPodIdSearch.entity().getId(),
+ JoinBuilder.JoinType.INNER);
clusterIdSearch.done();
SearchCriteria<Long> sc = clusterIdSearch.create();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java
index 1de310f..8c0dbe7 100644
--- a/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java
+++ b/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java
@@ -17,6 +17,7 @@
package com.cloud.dc.dao;
import java.util.List;
+
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@@ -78,6 +79,7 @@ public class ClusterVSMMapDaoImpl extends GenericDaoBase<ClusterVSMMapVO, Long>
return listBy(sc);
}
+ @Override
public boolean remove(Long id) {
TransactionLegacy txn = TransactionLegacy.currentTxn();
txn.start();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java
index 335be8b..9c6b553 100755
--- a/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java
+++ b/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java
@@ -26,7 +26,6 @@ import javax.inject.Inject;
import javax.naming.ConfigurationException;
import javax.persistence.TableGenerator;
-import org.apache.cloudstack.api.ResourceDetail;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java
index 441f3ae..d4fb1b4 100755
--- a/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java
+++ b/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java
@@ -47,6 +47,7 @@ public class DataCenterIpAddressDaoImpl extends GenericDaoBase<DataCenterIpAddre
private final GenericSearchBuilder<DataCenterIpAddressVO, Integer> AllIpCount;
private final GenericSearchBuilder<DataCenterIpAddressVO, Integer> AllAllocatedIpCount;
+ @Override
@DB
public DataCenterIpAddressVO takeIpAddress(long dcId, long podId, long instanceId, String reservationId) {
SearchCriteria<DataCenterIpAddressVO> sc = AllFieldsSearch.create();
@@ -68,6 +69,7 @@ public class DataCenterIpAddressDaoImpl extends GenericDaoBase<DataCenterIpAddre
return vo;
}
+ @Override
@DB
public DataCenterIpAddressVO takeDataCenterIpAddress(long dcId, String reservationId) {
SearchCriteria<DataCenterIpAddressVO> sc = AllFieldsSearch.create();
@@ -107,10 +109,12 @@ public class DataCenterIpAddressDaoImpl extends GenericDaoBase<DataCenterIpAddre
return update(vo, sc) >= 1;
}
+ @Override
@DB
public void addIpRange(long dcId, long podId, String start, String end) {
TransactionLegacy txn = TransactionLegacy.currentTxn();
- String insertSql = "INSERT INTO `cloud`.`op_dc_ip_address_alloc` (ip_address, data_center_id, pod_id, mac_address) VALUES (?, ?, ?, (select mac_address from `cloud`.`data_center` where id=?))";
+ String insertSql =
+ "INSERT INTO `cloud`.`op_dc_ip_address_alloc` (ip_address, data_center_id, pod_id, mac_address) VALUES (?, ?, ?, (select mac_address from `cloud`.`data_center` where id=?))";
String updateSql = "UPDATE `cloud`.`data_center` set mac_address = mac_address+1 where id=?";
PreparedStatement stmt = null;
@@ -139,6 +143,7 @@ public class DataCenterIpAddressDaoImpl extends GenericDaoBase<DataCenterIpAddre
}
}
+ @Override
public void releaseIpAddress(String ipAddress, long dcId, Long instanceId) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Releasing ip address: " + ipAddress + " data center " + dcId);
@@ -156,6 +161,7 @@ public class DataCenterIpAddressDaoImpl extends GenericDaoBase<DataCenterIpAddre
update(vo, sc);
}
+ @Override
public void releaseIpAddress(long nicId, String reservationId) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Releasing ip address for reservationId=" + reservationId + ", instance=" + nicId);
@@ -171,6 +177,7 @@ public class DataCenterIpAddressDaoImpl extends GenericDaoBase<DataCenterIpAddre
update(vo, sc);
}
+ @Override
public List<DataCenterIpAddressVO> listByPodIdDcId(long podId, long dcId) {
SearchCriteria<DataCenterIpAddressVO> sc = AllFieldsSearch.create();
sc.setParameters("pod", podId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java
index 4348a31..5917123 100644
--- a/engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java
+++ b/engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java
@@ -49,6 +49,7 @@ public class DataCenterLinkLocalIpAddressDaoImpl extends GenericDaoBase<DataCent
private final GenericSearchBuilder<DataCenterLinkLocalIpAddressVO, Integer> AllIpCount;
private final GenericSearchBuilder<DataCenterLinkLocalIpAddressVO, Integer> AllAllocatedIpCount;
+ @Override
@DB
public DataCenterLinkLocalIpAddressVO takeIpAddress(long dcId, long podId, long instanceId, String reservationId) {
SearchCriteria<DataCenterLinkLocalIpAddressVO> sc = AllFieldsSearch.create();
@@ -71,12 +72,14 @@ public class DataCenterLinkLocalIpAddressDaoImpl extends GenericDaoBase<DataCent
return vo;
}
+ @Override
public boolean deleteIpAddressByPod(long podId) {
SearchCriteria<DataCenterLinkLocalIpAddressVO> sc = AllFieldsSearch.create();
sc.setParameters("pod", podId);
return remove(sc) > 0;
}
+ @Override
@DB
public void addIpRange(long dcId, long podId, String start, String end) {
String insertSql = "INSERT INTO `cloud`.`op_dc_link_local_ip_address_alloc` (ip_address, data_center_id, pod_id) VALUES (?, ?, ?)";
@@ -102,6 +105,7 @@ public class DataCenterLinkLocalIpAddressDaoImpl extends GenericDaoBase<DataCent
}
}
+ @Override
public void releaseIpAddress(String ipAddress, long dcId, long instanceId) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Releasing ip address: " + ipAddress + " data center " + dcId);
@@ -119,6 +123,7 @@ public class DataCenterLinkLocalIpAddressDaoImpl extends GenericDaoBase<DataCent
update(vo, sc);
}
+ @Override
public void releaseIpAddress(long nicId, String reservationId) {
SearchCriteria<DataCenterLinkLocalIpAddressVO> sc = AllFieldsSearch.create();
sc.setParameters("instance", nicId);
@@ -132,12 +137,14 @@ public class DataCenterLinkLocalIpAddressDaoImpl extends GenericDaoBase<DataCent
update(vo, sc);
}
+ @Override
public List<DataCenterLinkLocalIpAddressVO> listByPodIdDcId(long podId, long dcId) {
SearchCriteria<DataCenterLinkLocalIpAddressVO> sc = AllFieldsSearch.create();
sc.setParameters("pod", podId);
return listBy(sc);
}
+ @Override
public int countIPs(long podId, long dcId, boolean onlyCountAllocated) {
SearchCriteria<Integer> sc;
if (onlyCountAllocated) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDao.java b/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDao.java
index 7924439..1783231 100644
--- a/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDao.java
+++ b/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDao.java
@@ -20,7 +20,6 @@ import java.util.List;
import com.cloud.dc.DataCenterVnetVO;
import com.cloud.utils.db.GenericDao;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
public interface DataCenterVnetDao extends GenericDao<DataCenterVnetVO, Long> {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
index 0498b71..3205fcd 100755
--- a/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
+++ b/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
@@ -67,6 +67,7 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase<DataCenterVnetVO, Long
@Inject
protected AccountGuestVlanMapDao _accountGuestVlanMapDao;
+ @Override
public List<DataCenterVnetVO> listAllocatedVnets(long physicalNetworkId) {
SearchCriteria<DataCenterVnetVO> sc = DcSearchAllocated.create();
sc.setParameters("physicalNetworkId", physicalNetworkId);
@@ -80,6 +81,7 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase<DataCenterVnetVO, Long
return listBy(sc).size();
}
+ @Override
public List<DataCenterVnetVO> listAllocatedVnetsInRange(long dcId, long physicalNetworkId, Integer start, Integer end) {
SearchCriteria<DataCenterVnetVO> sc = DcSearchAllocatedInRange.create();
sc.setParameters("dc", dcId);
@@ -88,6 +90,7 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase<DataCenterVnetVO, Long
return listBy(sc);
}
+ @Override
public void lockRange(long dcId, long physicalNetworkId, Integer start, Integer end) {
SearchCriteria<DataCenterVnetVO> sc = SearchRange.create();
sc.setParameters("dc", dcId);
@@ -96,6 +99,7 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase<DataCenterVnetVO, Long
lockRows(sc, null, true);
}
+ @Override
public List<DataCenterVnetVO> findVnet(long dcId, String vnet) {
SearchCriteria<DataCenterVnetVO> sc = VnetDcSearch.create();
;
@@ -104,12 +108,14 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase<DataCenterVnetVO, Long
return listBy(sc);
}
+ @Override
public int countZoneVlans(long dcId, boolean onlyCountAllocated) {
SearchCriteria<Integer> sc = onlyCountAllocated ? countAllocatedZoneVlans.create() : countZoneVlans.create();
sc.setParameters("dc", dcId);
return customSearch(sc, null).get(0);
}
+ @Override
public List<DataCenterVnetVO> findVnet(long dcId, long physicalNetworkId, String vnet) {
SearchCriteria<DataCenterVnetVO> sc = VnetDcSearch.create();
sc.setParameters("dc", dcId);
@@ -119,6 +125,7 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase<DataCenterVnetVO, Long
return listBy(sc);
}
+ @Override
@DB
//In the List<string> argument each string is a vlan. not a vlanRange.
public
@@ -143,6 +150,7 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase<DataCenterVnetVO, Long
}
//In the List<string> argument each string is a vlan. not a vlanRange.
+ @Override
public void deleteVnets(TransactionLegacy txn, long dcId, long physicalNetworkId, List<String> vnets) {
String deleteVnet = "DELETE FROM `cloud`.`op_dc_vnet_alloc` WHERE data_center_id=? AND physical_network_id=? AND taken IS NULL AND vnet=?";
try {
@@ -159,12 +167,14 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase<DataCenterVnetVO, Long
}
}
+ @Override
public void delete(long physicalNetworkId) {
SearchCriteria<DataCenterVnetVO> sc = VnetDcSearch.create();
sc.setParameters("physicalNetworkId", physicalNetworkId);
remove(sc);
}
+ @Override
@DB
public DataCenterVnetVO take(long physicalNetworkId, long accountId, String reservationId, List<Long> vlanDbIds) {
SearchCriteria<DataCenterVnetVO> sc;
@@ -191,6 +201,7 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase<DataCenterVnetVO, Long
return vo;
}
+ @Override
public void release(String vnet, long physicalNetworkId, long accountId, String reservationId) {
SearchCriteria<DataCenterVnetVO> sc = VnetDcSearchAllocated.create();
sc.setParameters("vnet", vnet);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/dao/HostPodDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/HostPodDao.java b/engine/schema/src/com/cloud/dc/dao/HostPodDao.java
index 1babef1..39c8a49 100644
--- a/engine/schema/src/com/cloud/dc/dao/HostPodDao.java
+++ b/engine/schema/src/com/cloud/dc/dao/HostPodDao.java
@@ -21,7 +21,6 @@ import java.util.List;
import com.cloud.dc.HostPodVO;
import com.cloud.utils.db.GenericDao;
-import com.cloud.vm.VirtualMachine;
public interface HostPodDao extends GenericDao<HostPodVO, Long> {
public List<HostPodVO> listByDataCenterId(long id);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/dao/PodVlanDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/PodVlanDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/PodVlanDaoImpl.java
index f2e6cba..2b98613 100755
--- a/engine/schema/src/com/cloud/dc/dao/PodVlanDaoImpl.java
+++ b/engine/schema/src/com/cloud/dc/dao/PodVlanDaoImpl.java
@@ -24,7 +24,6 @@ import java.util.List;
import org.springframework.stereotype.Component;
import com.cloud.dc.PodVlanVO;
-import com.cloud.utils.db.GenericDao;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@@ -40,12 +39,14 @@ public class PodVlanDaoImpl extends GenericDaoBase<PodVlanVO, Long> implements P
private final SearchBuilder<PodVlanVO> VlanPodSearch;
private final SearchBuilder<PodVlanVO> PodSearchAllocated;
+ @Override
public List<PodVlanVO> listAllocatedVnets(long podId) {
SearchCriteria<PodVlanVO> sc = PodSearchAllocated.create();
sc.setParameters("podId", podId);
return listBy(sc);
}
+ @Override
public void add(long podId, int start, int end) {
String insertVnet = "INSERT INTO `cloud`.`op_pod_vlan_alloc` (vlan, pod_id) VALUES ( ?, ?)";
@@ -65,6 +66,7 @@ public class PodVlanDaoImpl extends GenericDaoBase<PodVlanVO, Long> implements P
}
}
+ @Override
public void delete(long podId) {
String deleteVnet = "DELETE FROM `cloud`.`op_pod_vlan_alloc` WHERE pod_id = ?";
@@ -78,6 +80,7 @@ public class PodVlanDaoImpl extends GenericDaoBase<PodVlanVO, Long> implements P
}
}
+ @Override
public PodVlanVO take(long podId, long accountId) {
SearchCriteria<PodVlanVO> sc = FreeVlanSearch.create();
sc.setParameters("podId", podId);
@@ -101,6 +104,7 @@ public class PodVlanDaoImpl extends GenericDaoBase<PodVlanVO, Long> implements P
}
}
+ @Override
public void release(String vlan, long podId, long accountId) {
SearchCriteria<PodVlanVO> sc = VlanPodSearch.create();
sc.setParameters("vlan", vlan);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java
index f693464..2e7381c 100755
--- a/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java
+++ b/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java
@@ -29,8 +29,6 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.GenericQueryBuilder;
-import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.TransactionLegacy;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/dao/VlanDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/VlanDao.java b/engine/schema/src/com/cloud/dc/dao/VlanDao.java
index 9295586..485593e 100755
--- a/engine/schema/src/com/cloud/dc/dao/VlanDao.java
+++ b/engine/schema/src/com/cloud/dc/dao/VlanDao.java
@@ -16,13 +16,13 @@
// under the License.
package com.cloud.dc.dao;
+import java.util.List;
+
import com.cloud.dc.Vlan;
import com.cloud.dc.Vlan.VlanType;
import com.cloud.dc.VlanVO;
import com.cloud.utils.db.GenericDao;
-import java.util.List;
-
public interface VlanDao extends GenericDao<VlanVO, Long> {
VlanVO findByZoneAndVlanId(long zoneId, String vlanId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java
index 0bd8d3a..a38a96e 100755
--- a/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java
+++ b/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java
@@ -16,6 +16,19 @@
// under the License.
package com.cloud.dc.dao;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.ejb.Local;
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+
+import org.springframework.stereotype.Component;
+
import com.cloud.dc.AccountVlanMapVO;
import com.cloud.dc.PodVlanMapVO;
import com.cloud.dc.Vlan;
@@ -30,23 +43,13 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.exception.CloudRuntimeException;
-import org.springframework.stereotype.Component;
-
-import javax.ejb.Local;
-import javax.inject.Inject;
-import javax.naming.ConfigurationException;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
@Component
@Local(value = {VlanDao.class})
public class VlanDaoImpl extends GenericDaoBase<VlanVO, Long> implements VlanDao {
- private final String FindZoneWideVlans = "SELECT * FROM vlan WHERE data_center_id=? and vlan_type=? and vlan_id!=? and id not in (select vlan_db_id from account_vlan_map)";
+ private final String FindZoneWideVlans =
+ "SELECT * FROM vlan WHERE data_center_id=? and vlan_type=? and vlan_id!=? and id not in (select vlan_db_id from account_vlan_map)";
protected SearchBuilder<VlanVO> ZoneVlanIdSearch;
protected SearchBuilder<VlanVO> ZoneSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/domain/DomainVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/domain/DomainVO.java b/engine/schema/src/com/cloud/domain/DomainVO.java
index 68261e5..f6494b3 100644
--- a/engine/schema/src/com/cloud/domain/DomainVO.java
+++ b/engine/schema/src/com/cloud/domain/DomainVO.java
@@ -26,10 +26,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import org.apache.cloudstack.api.InternalIdentity;
import org.apache.log4j.Logger;
-import org.apache.cloudstack.api.Identity;
import com.cloud.utils.db.GenericDao;
@Entity
@@ -113,10 +111,10 @@ public class DomainVO implements Domain {
@Override
public void setParent(Long parent) {
if (parent == null) {
- this.parent = DomainVO.ROOT_DOMAIN;
+ this.parent = Domain.ROOT_DOMAIN;
} else {
- if (parent.longValue() <= DomainVO.ROOT_DOMAIN)
- this.parent = DomainVO.ROOT_DOMAIN;
+ if (parent.longValue() <= Domain.ROOT_DOMAIN)
+ this.parent = Domain.ROOT_DOMAIN;
else
this.parent = parent;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java b/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java
index 7c1f33c..e02daf1 100644
--- a/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java
+++ b/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java
@@ -105,8 +105,8 @@ public class DomainDaoImpl extends GenericDaoBase<DomainVO, Long> implements Dom
throw new IllegalArgumentException("Domain name is null. Please specify a valid domain name.");
}
- long parent = DomainVO.ROOT_DOMAIN;
- if (domain.getParent() != null && domain.getParent().longValue() >= DomainVO.ROOT_DOMAIN) {
+ long parent = Domain.ROOT_DOMAIN;
+ if (domain.getParent() != null && domain.getParent().longValue() >= Domain.ROOT_DOMAIN) {
parent = domain.getParent().longValue();
}
@@ -147,7 +147,7 @@ public class DomainDaoImpl extends GenericDaoBase<DomainVO, Long> implements Dom
@DB
public boolean remove(Long id) {
// check for any active users / domains assigned to the given domain id and don't remove the domain if there are any
- if (id != null && id.longValue() == DomainVO.ROOT_DOMAIN) {
+ if (id != null && id.longValue() == Domain.ROOT_DOMAIN) {
s_logger.error("Can not remove domain " + id + " as it is ROOT domain");
return false;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/event/EventVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/event/EventVO.java b/engine/schema/src/com/cloud/event/EventVO.java
index 6f99d1c..487ba84 100644
--- a/engine/schema/src/com/cloud/event/EventVO.java
+++ b/engine/schema/src/com/cloud/event/EventVO.java
@@ -87,6 +87,7 @@ public class EventVO implements Event {
this.uuid = UUID.randomUUID().toString();
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/event/UsageEventVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/event/UsageEventVO.java b/engine/schema/src/com/cloud/event/UsageEventVO.java
index 7b4a99e..719a79b 100644
--- a/engine/schema/src/com/cloud/event/UsageEventVO.java
+++ b/engine/schema/src/com/cloud/event/UsageEventVO.java
@@ -26,7 +26,6 @@ import javax.persistence.Id;
import javax.persistence.Table;
import com.cloud.utils.db.GenericDao;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = "usage_event")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/event/dao/EventDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/event/dao/EventDaoImpl.java b/engine/schema/src/com/cloud/event/dao/EventDaoImpl.java
index 5306e4d..be589e7 100644
--- a/engine/schema/src/com/cloud/event/dao/EventDaoImpl.java
+++ b/engine/schema/src/com/cloud/event/dao/EventDaoImpl.java
@@ -30,8 +30,8 @@ import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.db.SearchCriteria.Op;
+import com.cloud.utils.db.TransactionLegacy;
@Component
@Local(value = {EventDao.class})
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java b/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java
index 50b6bb0..f9261a9 100644
--- a/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java
+++ b/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java
@@ -48,10 +48,12 @@ public class UsageEventDaoImpl extends GenericDaoBase<UsageEventVO, Long> implem
private final SearchBuilder<UsageEventVO> latestEventsSearch;
private final SearchBuilder<UsageEventVO> IpeventsSearch;
- private static final String COPY_EVENTS = "INSERT INTO cloud_usage.usage_event (id, type, account_id, created, zone_id, resource_id, resource_name, offering_id, template_id, size, resource_type, virtual_size) "
- + "SELECT id, type, account_id, created, zone_id, resource_id, resource_name, offering_id, template_id, size, resource_type, virtual_size FROM cloud.usage_event vmevt WHERE vmevt.id > ? and vmevt.id <= ? ";
- private static final String COPY_ALL_EVENTS = "INSERT INTO cloud_usage.usage_event (id, type, account_id, created, zone_id, resource_id, resource_name, offering_id, template_id, size, resource_type, virtual_size) "
- + "SELECT id, type, account_id, created, zone_id, resource_id, resource_name, offering_id, template_id, size, resource_type, virtual_size FROM cloud.usage_event vmevt WHERE vmevt.id <= ?";
+ private static final String COPY_EVENTS =
+ "INSERT INTO cloud_usage.usage_event (id, type, account_id, created, zone_id, resource_id, resource_name, offering_id, template_id, size, resource_type, virtual_size) "
+ + "SELECT id, type, account_id, created, zone_id, resource_id, resource_name, offering_id, template_id, size, resource_type, virtual_size FROM cloud.usage_event vmevt WHERE vmevt.id > ? and vmevt.id <= ? ";
+ private static final String COPY_ALL_EVENTS =
+ "INSERT INTO cloud_usage.usage_event (id, type, account_id, created, zone_id, resource_id, resource_name, offering_id, template_id, size, resource_type, virtual_size) "
+ + "SELECT id, type, account_id, created, zone_id, resource_id, resource_name, offering_id, template_id, size, resource_type, virtual_size FROM cloud.usage_event vmevt WHERE vmevt.id <= ?";
private static final String MAX_EVENT = "select max(id) from cloud.usage_event where created <= ?";
@Inject
protected UsageEventDetailsDao usageEventDetailsDao;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java b/engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java
index cbd92b6..b2be1c9 100644
--- a/engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java
+++ b/engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java
@@ -16,18 +16,20 @@
// under the License.
package com.cloud.event.dao;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.ejb.Local;
+
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
import com.cloud.event.UsageEventDetailsVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.TransactionLegacy;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
-import javax.ejb.Local;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
@Component
@Local(value = {UsageEventDetailsDao.class})
[49/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/user/AccountService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/user/AccountService.java b/api/src/com/cloud/user/AccountService.java
index ddd27fd..a9be292 100755
--- a/api/src/com/cloud/user/AccountService.java
+++ b/api/src/com/cloud/user/AccountService.java
@@ -54,8 +54,8 @@ public interface AccountService {
*
* @return the user if created successfully, null otherwise
*/
- UserAccount createUserAccount(String userName, String password, String firstName, String lastName, String email, String timezone, String accountName, short accountType,
- Long domainId, String networkDomain, Map<String, String> details, String accountUUID, String userUUID);
+ UserAccount createUserAccount(String userName, String password, String firstName, String lastName, String email, String timezone, String accountName,
+ short accountType, Long domainId, String networkDomain, Map<String, String> details, String accountUUID, String userUUID);
/**
* Locks a user by userId. A locked user cannot access the API, but will still have running VMs/IP addresses
@@ -70,7 +70,8 @@ public interface AccountService {
User getSystemUser();
- User createUser(String userName, String password, String firstName, String lastName, String email, String timeZone, String accountName, Long domainId, String userUUID);
+ User
+ createUser(String userName, String password, String firstName, String lastName, String email, String timeZone, String accountName, Long domainId, String userUUID);
boolean isAdmin(short accountType);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/user/User.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/user/User.java b/api/src/com/cloud/user/User.java
index 48f936c..36e9028 100644
--- a/api/src/com/cloud/user/User.java
+++ b/api/src/com/cloud/user/User.java
@@ -23,6 +23,7 @@ import org.apache.cloudstack.api.InternalIdentity;
public interface User extends OwnedBy, InternalIdentity {
public static final long UID_SYSTEM = 1;
+ @Override
public long getId();
public String getUuid();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/user/UserAccount.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/user/UserAccount.java b/api/src/com/cloud/user/UserAccount.java
index 0cb0f69..c5a0637 100644
--- a/api/src/com/cloud/user/UserAccount.java
+++ b/api/src/com/cloud/user/UserAccount.java
@@ -21,6 +21,7 @@ import java.util.Date;
import org.apache.cloudstack.api.InternalIdentity;
public interface UserAccount extends InternalIdentity {
+ @Override
long getId();
String getUsername();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/vm/DiskProfile.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/DiskProfile.java b/api/src/com/cloud/vm/DiskProfile.java
index f72142c..2f7cd96 100644
--- a/api/src/com/cloud/vm/DiskProfile.java
+++ b/api/src/com/cloud/vm/DiskProfile.java
@@ -45,7 +45,8 @@ public class DiskProfile {
protected DiskProfile() {
}
- public DiskProfile(long volumeId, Volume.Type type, String name, long diskOfferingId, long size, String[] tags, boolean useLocalStorage, boolean recreatable, Long templateId) {
+ public DiskProfile(long volumeId, Volume.Type type, String name, long diskOfferingId, long size, String[] tags, boolean useLocalStorage, boolean recreatable,
+ Long templateId) {
this.type = type;
this.name = name;
this.size = size;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/vm/NicIpAlias.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/NicIpAlias.java b/api/src/com/cloud/vm/NicIpAlias.java
index c212226..d7431ba 100644
--- a/api/src/com/cloud/vm/NicIpAlias.java
+++ b/api/src/com/cloud/vm/NicIpAlias.java
@@ -31,6 +31,7 @@ public interface NicIpAlias extends ControlledEntity, Identity, InternalIdentity
active, revoked,
}
+ @Override
long getId();
long getNicId();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/vm/NicProfile.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/NicProfile.java b/api/src/com/cloud/vm/NicProfile.java
index 30d9b1d..ab18ca0 100644
--- a/api/src/com/cloud/vm/NicProfile.java
+++ b/api/src/com/cloud/vm/NicProfile.java
@@ -162,6 +162,7 @@ public class NicProfile implements InternalIdentity {
return vmId;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/vm/NicSecondaryIp.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/NicSecondaryIp.java b/api/src/com/cloud/vm/NicSecondaryIp.java
index 02937f4..fb90dd3 100644
--- a/api/src/com/cloud/vm/NicSecondaryIp.java
+++ b/api/src/com/cloud/vm/NicSecondaryIp.java
@@ -27,6 +27,7 @@ public interface NicSecondaryIp extends ControlledEntity, Identity, InternalIden
/**
* @return id in the CloudStack database
*/
+ @Override
long getId();
long getNicId();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/vm/UserVmService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/com/cloud/vm/UserVmService.java
index 3aac6c3..444c47a 100755
--- a/api/src/com/cloud/vm/UserVmService.java
+++ b/api/src/com/cloud/vm/UserVmService.java
@@ -40,6 +40,7 @@ import org.apache.cloudstack.api.command.user.vm.UpdateVMCmd;
import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd;
import org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd;
import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd;
+
import com.cloud.dc.DataCenter;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@@ -202,11 +203,11 @@ public interface UserVmService {
* available.
* @throws InsufficientResourcesException
*/
- UserVm createBasicSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List<Long> securityGroupIdList, Account owner,
- String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, String userData,
- String sshKeyPair, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIp, Boolean displayVm, String keyboard, List<Long> affinityGroupIdList, Integer cpuSpeed,
- Integer memory, Integer cpuNumber, Long rootdisksize) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException,
- StorageUnavailableException, ResourceAllocationException;
+ UserVm createBasicSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List<Long> securityGroupIdList,
+ Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod,
+ String userData, String sshKeyPair, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIp, Boolean displayVm, String keyboard,
+ List<Long> affinityGroupIdList, Integer cpuSpeed, Integer memory, Integer cpuNumber, Long rootdisksize) throws InsufficientCapacityException,
+ ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
/**
* Creates a User VM in Advanced Zone (Security Group feature is enabled) in
@@ -284,8 +285,8 @@ public interface UserVmService {
UserVm createAdvancedSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List<Long> networkIdList,
List<Long> securityGroupIdList, Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor,
HTTPMethod httpmethod, String userData, String sshKeyPair, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard,
- List<Long> affinityGroupIdList, Integer cpuSpeed, Integer memory, Integer cpuNumber, Long rootdisksize) throws InsufficientCapacityException, ConcurrentOperationException,
- ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
+ List<Long> affinityGroupIdList, Integer cpuSpeed, Integer memory, Integer cpuNumber, Long rootdisksize) throws InsufficientCapacityException,
+ ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
/**
* Creates a User VM in Advanced Zone (Security Group feature is disabled)
@@ -359,10 +360,10 @@ public interface UserVmService {
*/
UserVm createAdvancedVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List<Long> networkIdList, Account owner,
String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, String userData,
- String sshKeyPair, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard, List<Long> affinityGroupIdList, Integer cpuSpeed,
- Integer memory, Integer cpuNumber, Long rootdkisksize)
+ String sshKeyPair, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard, List<Long> affinityGroupIdList,
+ Integer cpuSpeed, Integer memory, Integer cpuNumber, Long rootdkisksize)
- throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
+ throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
/**
* Starts the virtual machine created from createVirtualMachine.
@@ -407,8 +408,8 @@ public interface UserVmService {
HypervisorType getHypervisorTypeOfUserVM(long vmid);
- UserVm createVirtualMachine(DeployVMCmd cmd) throws InsufficientCapacityException, ResourceUnavailableException, ConcurrentOperationException, StorageUnavailableException,
- ResourceAllocationException;
+ UserVm createVirtualMachine(DeployVMCmd cmd) throws InsufficientCapacityException, ResourceUnavailableException, ConcurrentOperationException,
+ StorageUnavailableException, ResourceAllocationException;
UserVm getUserVm(long vmId);
@@ -464,13 +465,15 @@ public interface UserVmService {
VirtualMachine migrateVirtualMachineWithVolume(Long vmId, Host destinationHost, Map<String, String> volumeToPool) throws ResourceUnavailableException,
ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException;
- UserVm moveVMToUser(AssignVMCmd moveUserVMCmd) throws ResourceAllocationException, ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
+ UserVm moveVMToUser(AssignVMCmd moveUserVMCmd) throws ResourceAllocationException, ConcurrentOperationException, ResourceUnavailableException,
+ InsufficientCapacityException;
VirtualMachine vmStorageMigration(Long vmId, StoragePool destPool);
UserVm restoreVM(RestoreVMCmd cmd) throws InsufficientCapacityException, ResourceUnavailableException;
- UserVm upgradeVirtualMachine(ScaleVMCmd cmd) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException;
+ UserVm upgradeVirtualMachine(ScaleVMCmd cmd) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException,
+ VirtualMachineMigrationException;
UserVm expungeVm(ExpungeVMCmd cmd) throws ResourceUnavailableException, ConcurrentOperationException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/vm/VirtualMachine.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/VirtualMachine.java b/api/src/com/cloud/vm/VirtualMachine.java
index ad13399..f12aebc 100755
--- a/api/src/com/cloud/vm/VirtualMachine.java
+++ b/api/src/com/cloud/vm/VirtualMachine.java
@@ -38,15 +38,16 @@ public interface VirtualMachine extends RunningOn, ControlledEntity, Identity, I
}
public enum State {
- Starting(true, "VM is being started. At this state, you should find host id filled which means it's being started on that host."), Running(
- false,
- "VM is running. host id has the host that it is running on."), Stopping(true, "VM is being stopped. host id has the host that it is being stopped on."), Stopped(
- false,
- "VM is stopped. host id should be null."), Destroyed(false, "VM is marked for destroy."), Expunging(true, "VM is being expunged."), Migrating(
- true,
- "VM is being migrated. host id holds to from host"), Error(false, "VM is in error"), Unknown(false, "VM state is unknown."), Shutdowned(
- false,
- "VM is shutdowned from inside");
+ Starting(true, "VM is being started. At this state, you should find host id filled which means it's being started on that host."),
+ Running(false, "VM is running. host id has the host that it is running on."),
+ Stopping(true, "VM is being stopped. host id has the host that it is being stopped on."),
+ Stopped(false, "VM is stopped. host id should be null."),
+ Destroyed(false, "VM is marked for destroy."),
+ Expunging(true, "VM is being expunged."),
+ Migrating(true, "VM is being migrated. host id holds to from host"),
+ Error(false, "VM is in error"),
+ Unknown(false, "VM state is unknown."),
+ Shutdowned(false, "VM is shutdowned from inside");
private final boolean _transitional;
String _description;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/com/cloud/vm/snapshot/VMSnapshot.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/snapshot/VMSnapshot.java b/api/src/com/cloud/vm/snapshot/VMSnapshot.java
index 3cd52c2..7713b20 100644
--- a/api/src/com/cloud/vm/snapshot/VMSnapshot.java
+++ b/api/src/com/cloud/vm/snapshot/VMSnapshot.java
@@ -19,23 +19,19 @@ package com.cloud.vm.snapshot;
import java.util.Date;
+import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
-import org.apache.cloudstack.acl.ControlledEntity;
import com.cloud.utils.fsm.StateMachine2;
import com.cloud.utils.fsm.StateObject;
public interface VMSnapshot extends ControlledEntity, Identity, InternalIdentity, StateObject<VMSnapshot.State> {
enum State {
- Allocated("The VM snapshot is allocated but has not been created yet."),
- Creating("The VM snapshot is being created."),
- Ready("The VM snapshot is ready to be used."),
- Reverting("The VM snapshot is being used to revert"),
- Expunging("The volume is being expunging"),
- Removed("The volume is destroyed, and can't be recovered."),
- Error("The volume is in error state, and can't be recovered");
+ Allocated("The VM snapshot is allocated but has not been created yet."), Creating("The VM snapshot is being created."), Ready(
+ "The VM snapshot is ready to be used."), Reverting("The VM snapshot is being used to revert"), Expunging("The volume is being expunging"), Removed(
+ "The volume is destroyed, and can't be recovered."), Error("The volume is in error state, and can't be recovered");
String _description;
@@ -74,12 +70,14 @@ public interface VMSnapshot extends ControlledEntity, Identity, InternalIdentity
CreateRequested, OperationFailed, OperationSucceeded, RevertRequested, ExpungeRequested,
}
+ @Override
long getId();
public String getName();
public Long getVmId();
+ @Override
public State getState();
public Date getCreated();
@@ -102,5 +100,6 @@ public interface VMSnapshot extends ControlledEntity, Identity, InternalIdentity
public Date getRemoved();
+ @Override
public long getAccountId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java b/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java
index 82807fe..aa0b4e6 100644
--- a/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java
+++ b/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java
@@ -17,21 +17,16 @@
package org.apache.cloudstack.affinity;
import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
import java.util.List;
-import java.util.Set;
+
+import com.google.gson.annotations.SerializedName;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
-import org.apache.cloudstack.api.response.ControlledEntityResponse;
import org.apache.cloudstack.api.response.ControlledViewEntityResponse;
-import org.apache.cloudstack.api.response.UserVmResponse;
-import com.cloud.network.security.SecurityGroup;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
@EntityReference(value = AffinityGroup.class)
@@ -93,6 +88,7 @@ public class AffinityGroupResponse extends BaseResponse implements ControlledVie
this.description = description;
}
+ @Override
public void setAccountName(String accountName) {
this.accountName = accountName;
}
@@ -106,6 +102,7 @@ public class AffinityGroupResponse extends BaseResponse implements ControlledVie
this.domainId = domainId;
}
+ @Override
public void setDomainName(String domainName) {
this.domainName = domainName;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java b/api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java
index 8d8e103..6f5fb23 100644
--- a/api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java
+++ b/api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java
@@ -16,18 +16,13 @@
// under the License.
package org.apache.cloudstack.affinity;
-import java.util.HashSet;
-import java.util.Set;
+import com.google.gson.annotations.SerializedName;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
-import org.apache.cloudstack.api.response.ControlledEntityResponse;
-import org.apache.cloudstack.api.response.ControlledViewEntityResponse;
-import com.cloud.network.security.SecurityGroup;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
@EntityReference(value = AffinityGroup.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/ApiErrorCode.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/ApiErrorCode.java b/api/src/org/apache/cloudstack/api/ApiErrorCode.java
index fc196cf..fa47f30 100644
--- a/api/src/org/apache/cloudstack/api/ApiErrorCode.java
+++ b/api/src/org/apache/cloudstack/api/ApiErrorCode.java
@@ -50,6 +50,7 @@ public enum ApiErrorCode {
this.httpCode = httpCode;
}
+ @Override
public String toString() {
return String.valueOf(this.httpCode);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/BaseCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseCmd.java b/api/src/org/apache/cloudstack/api/BaseCmd.java
index 3ca5dd4..b060f43 100644
--- a/api/src/org/apache/cloudstack/api/BaseCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseCmd.java
@@ -26,18 +26,15 @@ import java.util.regex.Pattern;
import javax.inject.Inject;
-import org.apache.cloudstack.affinity.AffinityGroupService;
-
-import com.cloud.server.ResourceMetaDataService;
+import org.apache.log4j.Logger;
+import org.apache.cloudstack.affinity.AffinityGroupService;
import org.apache.cloudstack.network.element.InternalLoadBalancerElementService;
import org.apache.cloudstack.network.lb.ApplicationLoadBalancerService;
import org.apache.cloudstack.network.lb.InternalLoadBalancerVMService;
import org.apache.cloudstack.query.QueryService;
import org.apache.cloudstack.usage.UsageService;
-import org.apache.log4j.Logger;
-
import com.cloud.configuration.ConfigurationService;
import com.cloud.domain.Domain;
import com.cloud.exception.ConcurrentOperationException;
@@ -54,10 +51,10 @@ import com.cloud.network.StorageNetworkService;
import com.cloud.network.VpcVirtualNetworkApplianceService;
import com.cloud.network.as.AutoScaleService;
import com.cloud.network.firewall.FirewallService;
-import com.cloud.network.vpc.NetworkACLService;
import com.cloud.network.lb.LoadBalancingRulesService;
import com.cloud.network.rules.RulesService;
import com.cloud.network.security.SecurityGroupService;
+import com.cloud.network.vpc.NetworkACLService;
import com.cloud.network.vpc.VpcProvisioningService;
import com.cloud.network.vpc.VpcService;
import com.cloud.network.vpn.RemoteAccessVpnService;
@@ -66,6 +63,7 @@ import com.cloud.projects.Project;
import com.cloud.projects.ProjectService;
import com.cloud.resource.ResourceService;
import com.cloud.server.ManagementService;
+import com.cloud.server.ResourceMetaDataService;
import com.cloud.server.TaggedResourceService;
import com.cloud.storage.DataStoreProviderApiService;
import com.cloud.storage.StorageService;
@@ -272,7 +270,7 @@ public abstract class BaseCmd {
int arrayStartLastIndex = key.lastIndexOf('[');
if (arrayStartIndex != arrayStartLastIndex) {
throw new ServerApiException(ApiErrorCode.MALFORMED_PARAMETER_ERROR, "Unable to decode parameter " + key +
- "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup");
+ "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup");
}
if (arrayStartIndex > 0) {
@@ -281,7 +279,7 @@ public abstract class BaseCmd {
if ((arrayEndIndex < arrayStartIndex) || (arrayEndIndex != arrayEndLastIndex)) {
// malformed parameter
throw new ServerApiException(ApiErrorCode.MALFORMED_PARAMETER_ERROR, "Unable to decode parameter " + key +
- "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup");
+ "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup");
}
// Now that we have an array object, check for a field name in the case of a complex object
@@ -289,7 +287,7 @@ public abstract class BaseCmd {
String fieldName = null;
if (fieldIndex < arrayEndIndex) {
throw new ServerApiException(ApiErrorCode.MALFORMED_PARAMETER_ERROR, "Unable to decode parameter " + key +
- "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup");
+ "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup");
} else {
fieldName = key.substring(fieldIndex + 1);
}
@@ -314,7 +312,7 @@ public abstract class BaseCmd {
if (!parsedIndex) {
throw new ServerApiException(ApiErrorCode.MALFORMED_PARAMETER_ERROR, "Unable to decode parameter " + key +
- "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup");
+ "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup");
}
Object value = lowercaseParams.get(paramName);
@@ -349,7 +347,8 @@ public abstract class BaseCmd {
}
public static boolean isAdmin(short accountType) {
- return ((accountType == Account.ACCOUNT_TYPE_ADMIN) || (accountType == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_READ_ONLY_ADMIN));
+ return ((accountType == Account.ACCOUNT_TYPE_ADMIN) || (accountType == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) ||
+ (accountType == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_READ_ONLY_ADMIN));
}
public static boolean isRootAdmin(short accountType) {
@@ -381,7 +380,7 @@ public abstract class BaseCmd {
return account.getId();
} else {
throw new PermissionDeniedException("Can't add resources to the account id=" + account.getId() + " in state=" + account.getState() +
- " as it's no longer active");
+ " as it's no longer active");
}
} else {
// idList is not used anywhere, so removed it now
@@ -397,8 +396,9 @@ public abstract class BaseCmd {
if (!enabledOnly || project.getState() == Project.State.Active) {
return project.getProjectAccountId();
} else {
- PermissionDeniedException ex = new PermissionDeniedException("Can't add resources to the project with specified projectId in state=" + project.getState() +
- " as it's no longer active");
+ PermissionDeniedException ex =
+ new PermissionDeniedException("Can't add resources to the project with specified projectId in state=" + project.getState() +
+ " as it's no longer active");
ex.addProxyObject(project.getUuid(), "projectId");
throw ex;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/BaseListCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseListCmd.java b/api/src/org/apache/cloudstack/api/BaseListCmd.java
index d3ebb95..dfb3f3b 100644
--- a/api/src/org/apache/cloudstack/api/BaseListCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseListCmd.java
@@ -64,6 +64,7 @@ public abstract class BaseListCmd extends BaseCmd {
return pageSize;
}
+ @Override
public void configure() {
if (MAX_PAGESIZE == null) {
if (_configService.getDefaultPageSize().longValue() != PAGESIZE_UNLIMITED) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/BaseListDomainResourcesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseListDomainResourcesCmd.java b/api/src/org/apache/cloudstack/api/BaseListDomainResourcesCmd.java
index b74ec2f..79f7edc 100644
--- a/api/src/org/apache/cloudstack/api/BaseListDomainResourcesCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseListDomainResourcesCmd.java
@@ -20,18 +20,18 @@ import org.apache.cloudstack.api.response.DomainResponse;
public abstract class BaseListDomainResourcesCmd extends BaseListCmd {
- @Parameter(name = ApiConstants.LIST_ALL,
- type = CommandType.BOOLEAN,
- description = "If set to false, "
- + "list only resources belonging to the command's caller; if set to true - list resources that the caller is authorized to see. Default value is false")
+ @Parameter(name = ApiConstants.LIST_ALL, type = CommandType.BOOLEAN, description = "If set to false, "
+ + "list only resources belonging to the command's caller; if set to true - list resources that the caller is authorized to see. Default value is false")
private Boolean listAll;
- @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "list only resources belonging to the domain specified")
+ @Parameter(name = ApiConstants.DOMAIN_ID,
+ type = CommandType.UUID,
+ entityType = DomainResponse.class,
+ description = "list only resources belonging to the domain specified")
private Long domainId;
- @Parameter(name = ApiConstants.IS_RECURSIVE,
- type = CommandType.BOOLEAN,
- description = "defaults to false," + " but if true, lists all resources from the parent specified by the domainId till leaves.")
+ @Parameter(name = ApiConstants.IS_RECURSIVE, type = CommandType.BOOLEAN, description = "defaults to false,"
+ + " but if true, lists all resources from the parent specified by the domainId till leaves.")
private Boolean recursive;
public boolean listAll() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java
index 67b0bfa..c9725a5 100644
--- a/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java
@@ -18,11 +18,11 @@ package org.apache.cloudstack.api;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.response.TemplatePermissionsResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/BaseResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseResponse.java b/api/src/org/apache/cloudstack/api/BaseResponse.java
index a31a7d5..05de218 100644
--- a/api/src/org/apache/cloudstack/api/BaseResponse.java
+++ b/api/src/org/apache/cloudstack/api/BaseResponse.java
@@ -16,9 +16,10 @@
// under the License.
package org.apache.cloudstack.api;
-import com.cloud.serializer.Param;
import com.google.gson.annotations.SerializedName;
+import com.cloud.serializer.Param;
+
public abstract class BaseResponse implements ResponseObject {
private transient String responseName;
private transient String objectName;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
index f58f251..2350f6b 100644
--- a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
@@ -16,10 +16,11 @@
// under the License.
package org.apache.cloudstack.api;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.command.user.iso.UpdateIsoCmd;
import org.apache.cloudstack.api.response.GuestOSResponse;
import org.apache.cloudstack.api.response.TemplateResponse;
-import org.apache.log4j.Logger;
public abstract class BaseUpdateTemplateOrIsoCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateIsoCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java
index 84249fc..5d05439 100644
--- a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java
@@ -18,10 +18,11 @@ package org.apache.cloudstack.api;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.TemplateResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.InvalidParameterValueException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
index 3ca8e54..c5a2d1a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
@@ -16,8 +16,10 @@
// under the License.
package org.apache.cloudstack.api.command.admin.account;
-import com.cloud.user.Account;
-import com.cloud.user.UserAccount;
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
@@ -29,10 +31,8 @@ import org.apache.cloudstack.api.response.AccountResponse;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
-import java.util.Collection;
-import java.util.Map;
+import com.cloud.user.Account;
+import com.cloud.user.UserAccount;
@APICommand(name = "createAccount", description = "Creates an account", responseObject = AccountResponse.class)
public class CreateAccountCmd extends BaseCmd {
@@ -172,8 +172,9 @@ public class CreateAccountCmd extends BaseCmd {
@Override
public void execute() {
CallContext.current().setEventDetails("Account Name: " + getAccountName() + ", Domain Id:" + getDomainId());
- UserAccount userAccount = _accountService.createUserAccount(getUsername(), getPassword(), getFirstName(), getLastName(), getEmail(), getTimeZone(), getAccountName(),
- getAccountType(), getDomainId(), getNetworkDomain(), getDetails(), getAccountUUID(), getUserUUID());
+ UserAccount userAccount =
+ _accountService.createUserAccount(getUsername(), getPassword(), getFirstName(), getLastName(), getEmail(), getTimeZone(), getAccountName(), getAccountType(),
+ getDomainId(), getNetworkDomain(), getDetails(), getAccountUUID(), getUserUUID());
if (userAccount != null) {
AccountResponse response = _responseGenerator.createUserAccountResponse(userAccount);
response.setResponseName(getCommandName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
index e37846d..7c1b206 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.account;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -30,8 +32,6 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.user.User;
@@ -91,7 +91,7 @@ public class DeleteAccountCmd extends BaseAsyncCmd {
public String getEventDescription() {
User user = _responseGenerator.findUserById(getId());
return (user != null ? ("deleting User " + user.getUsername() + " (id: " + user.getId() + ") and accountId = " + user.getAccountId())
- : "user delete, but this user does not exist in the system");
+ : "user delete, but this user does not exist in the system");
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
index beb28dd..6fdbefe 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.account;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -30,8 +32,6 @@ import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.ResourceUnavailableException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
index 729d876..59d6acd 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.account;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,7 +29,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.AccountResponse;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
index e098b39..93ec1be 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.command.admin.account;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.AccountResponse;
import org.apache.cloudstack.api.response.DomainResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
index 6542ebc..a8cf63f 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
@@ -21,6 +21,8 @@ import java.util.Map;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -30,7 +32,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.AccountResponse;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
index 3eb7679..6c4b81b 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
@@ -17,6 +17,8 @@
package org.apache.cloudstack.api.command.admin.autoscale;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -25,7 +27,6 @@ import org.apache.cloudstack.api.BaseAsyncCreateCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.CounterResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.network.as.Counter;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
index b9b6dd1..50477f5 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
@@ -17,6 +17,8 @@
package org.apache.cloudstack.api.command.admin.autoscale;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.CounterResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceInUseException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
index 67d2501..d0e7380 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
@@ -20,6 +20,8 @@ package org.apache.cloudstack.api.command.admin.cluster;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -30,7 +32,6 @@ import org.apache.cloudstack.api.response.ClusterResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.DiscoveryException;
import com.cloud.exception.ResourceInUseException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
index 12eb9bc..e1bc585 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.cluster;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ClusterResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
index b74054a..8640f37 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.cluster;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -28,7 +30,6 @@ import org.apache.cloudstack.api.response.ClusterResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.org.Cluster;
import com.cloud.utils.Pair;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
index 7f5fa1f..b13f81a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.cluster;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ClusterResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.org.Cluster;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
index d6fe5e7..2c31dfd 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
@@ -19,15 +19,20 @@ package org.apache.cloudstack.api.command.admin.config;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.response.*;
+import org.apache.cloudstack.api.response.AccountResponse;
+import org.apache.cloudstack.api.response.ClusterResponse;
+import org.apache.cloudstack.api.response.ConfigurationResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.StoragePoolResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.config.Configuration;
-import org.apache.log4j.Logger;
-
import com.cloud.utils.Pair;
@APICommand(name = "listConfigurations", description = "Lists all configurations.", responseObject = ConfigurationResponse.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java
index 65a4c84..1d9d2d9 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java
@@ -19,11 +19,12 @@ package org.apache.cloudstack.api.command.admin.config;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.response.DeploymentPlannersResponse;
import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.log4j.Logger;
@APICommand(name = "listDeploymentPlanners", description = "Lists all DeploymentPlanners available.", responseObject = DeploymentPlannersResponse.class)
public class ListDeploymentPlannersCmd extends BaseListCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
index 184758a..16adf66 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
@@ -19,19 +19,23 @@ package org.apache.cloudstack.api.command.admin.config;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse;
import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.log4j.Logger;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.hypervisor.HypervisorCapabilities;
import com.cloud.utils.Pair;
-@APICommand(name = "listHypervisorCapabilities", description = "Lists all hypervisor capabilities.", responseObject = HypervisorCapabilitiesResponse.class, since = "3.0.0")
+@APICommand(name = "listHypervisorCapabilities",
+ description = "Lists all hypervisor capabilities.",
+ responseObject = HypervisorCapabilitiesResponse.class,
+ since = "3.0.0")
public class ListHypervisorCapabilitiesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListHypervisorCapabilitiesCmd.class.getName());
@@ -74,8 +78,8 @@ public class ListHypervisorCapabilitiesCmd extends BaseListCmd {
@Override
public void execute() {
- Pair<List<? extends HypervisorCapabilities>, Integer> hpvCapabilities = _mgr.listHypervisorCapabilities(getId(), getHypervisor(), getKeyword(), this.getStartIndex(),
- this.getPageSizeVal());
+ Pair<List<? extends HypervisorCapabilities>, Integer> hpvCapabilities =
+ _mgr.listHypervisorCapabilities(getId(), getHypervisor(), getKeyword(), this.getStartIndex(), this.getPageSizeVal());
ListResponse<HypervisorCapabilitiesResponse> response = new ListResponse<HypervisorCapabilitiesResponse>();
List<HypervisorCapabilitiesResponse> hpvCapabilitiesResponses = new ArrayList<HypervisorCapabilitiesResponse>();
for (HypervisorCapabilities capability : hpvCapabilities.first()) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
index c279478..fe6e3d6 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
@@ -16,17 +16,21 @@
// under the License.
package org.apache.cloudstack.api.command.admin.config;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.response.*;
+import org.apache.cloudstack.api.response.AccountResponse;
+import org.apache.cloudstack.api.response.ClusterResponse;
+import org.apache.cloudstack.api.response.ConfigurationResponse;
+import org.apache.cloudstack.api.response.StoragePoolResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.config.Configuration;
-import org.apache.log4j.Logger;
-
import com.cloud.user.Account;
@APICommand(name = "updateConfiguration", description = "Updates a configuration.", responseObject = ConfigurationResponse.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
index 1f2c852..5cb5f9c 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
@@ -16,8 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.config;
-import com.cloud.hypervisor.HypervisorCapabilities;
-import com.cloud.user.Account;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -25,9 +25,14 @@ import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse;
-import org.apache.log4j.Logger;
-@APICommand(name = "updateHypervisorCapabilities", description = "Updates a hypervisor capabilities.", responseObject = HypervisorCapabilitiesResponse.class, since = "3.0.0")
+import com.cloud.hypervisor.HypervisorCapabilities;
+import com.cloud.user.Account;
+
+@APICommand(name = "updateHypervisorCapabilities",
+ description = "Updates a hypervisor capabilities.",
+ responseObject = HypervisorCapabilitiesResponse.class,
+ since = "3.0.0")
public class UpdateHypervisorCapabilitiesCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateHypervisorCapabilitiesCmd.class.getName());
private static final String s_name = "updatehypervisorcapabilitiesresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
index caac5bb..4737555 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.domain;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -25,8 +27,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.domain.Domain;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
index a3adb61..b1075c1 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.domain;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -29,8 +31,6 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
-
import com.cloud.domain.Domain;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
index f8851da..e1ba178 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.command.admin.domain;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.log4j.Logger;
import com.cloud.domain.Domain;
import com.cloud.utils.Pair;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java
index 3e09aa9..5a3786c 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.command.admin.domain;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.log4j.Logger;
import com.cloud.domain.Domain;
import com.cloud.utils.Pair;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
index cac425f..8acfcd5 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.domain;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -28,11 +30,8 @@ import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
-
import com.cloud.domain.Domain;
import com.cloud.user.Account;
-import com.cloud.user.UserAccount;
@APICommand(name = "updateDomain", description = "Updates a domain with a new name", responseObject = DomainResponse.class)
public class UpdateDomainCmd extends BaseCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
index 2ce1462..363bcd6 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.host;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -30,7 +32,6 @@ import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.DiscoveryException;
import com.cloud.host.Host;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
index 9e582d7..61f6f49 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.host;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -25,7 +27,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.admin.storage.AddImageStoreCmd;
import org.apache.cloudstack.api.response.ImageStoreResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.DiscoveryException;
import com.cloud.storage.ImageStore;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
index 8c22508..46289ee 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.host;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.host.Host;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
index d1747da..5a4478e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.host;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java
index 97229f4..0faf72c 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java
@@ -20,15 +20,16 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.cloudstack.api.APICommand;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.HostForMigrationResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
+
import com.cloud.host.Host;
import com.cloud.utils.Pair;
import com.cloud.utils.Ternary;
@@ -73,8 +74,8 @@ public class FindHostsForMigrationCmd extends BaseListCmd {
Pair<List<? extends Host>, Integer> result;
Map<Host, Boolean> hostsRequiringStorageMotion;
- Ternary<Pair<List<? extends Host>, Integer>, List<? extends Host>, Map<Host, Boolean>> hostsForMigration = _mgr.listHostsForMigrationOfVM(getVirtualMachineId(),
- this.getStartIndex(), this.getPageSizeVal());
+ Ternary<Pair<List<? extends Host>, Integer>, List<? extends Host>, Map<Host, Boolean>> hostsForMigration =
+ _mgr.listHostsForMigrationOfVM(getVirtualMachineId(), this.getStartIndex(), this.getPageSizeVal());
result = hostsForMigration.first();
List<? extends Host> hostsWithCapacity = hostsForMigration.second();
hostsRequiringStorageMotion = hostsForMigration.third();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
index 3cee0d8..eda821b 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
@@ -21,7 +21,8 @@ import java.util.EnumSet;
import java.util.List;
import java.util.Map;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -34,10 +35,10 @@ import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.host.Host;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.utils.Pair;
import com.cloud.utils.Ternary;
@@ -152,7 +153,8 @@ public class ListHostsCmd extends BaseListCmd {
}
dv = EnumSet.copyOf(dc);
} catch (IllegalArgumentException e) {
- throw new InvalidParameterValueException("The details parameter contains a non permitted value. The allowed values are " + EnumSet.allOf(HostDetails.class));
+ throw new InvalidParameterValueException("The details parameter contains a non permitted value. The allowed values are " +
+ EnumSet.allOf(HostDetails.class));
}
}
return dv;
@@ -171,6 +173,7 @@ public class ListHostsCmd extends BaseListCmd {
return s_name;
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Host;
}
@@ -182,8 +185,8 @@ public class ListHostsCmd extends BaseListCmd {
response = _queryService.searchForServers(this);
} else {
Pair<List<? extends Host>, Integer> result;
- Ternary<Pair<List<? extends Host>, Integer>, List<? extends Host>, Map<Host, Boolean>> hostsForMigration = _mgr.listHostsForMigrationOfVM(getVirtualMachineId(),
- this.getStartIndex(), this.getPageSizeVal());
+ Ternary<Pair<List<? extends Host>, Integer>, List<? extends Host>, Map<Host, Boolean>> hostsForMigration =
+ _mgr.listHostsForMigrationOfVM(getVirtualMachineId(), this.getStartIndex(), this.getPageSizeVal());
result = hostsForMigration.first();
List<? extends Host> hostsWithCapacity = hostsForMigration.second();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
index 3b8ff5a..23cfacf 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.host;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.host.Host;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
index d2d8745..1ce888b 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.host;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.host.Host;
import com.cloud.user.Account;
@@ -86,10 +86,12 @@ public class ReconnectHostCmd extends BaseAsyncCmd {
return "reconnecting host: " + getId();
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Host;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java
index da5599a..b60feca 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.host;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
index a751b6a..d778b37 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.host;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.GuestOSCategoryResponse;
import org.apache.cloudstack.api.response.HostResponse;
-import org.apache.log4j.Logger;
import com.cloud.host.Host;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
index 6a08c0d..69480b1 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.host;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ClusterResponse;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java
index 5ad4335..51da760 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java
@@ -17,12 +17,11 @@
package org.apache.cloudstack.api.command.admin.internallb;
-import com.cloud.event.EventTypes;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.VirtualRouterProvider;
-import com.cloud.user.Account;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
@@ -34,11 +33,12 @@ import org.apache.cloudstack.api.response.InternalLoadBalancerElementResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.network.element.InternalLoadBalancerElementService;
-import org.apache.log4j.Logger;
-
-import javax.inject.Inject;
-
-import java.util.List;
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.VirtualRouterProvider;
+import com.cloud.user.Account;
@APICommand(name = "configureInternalLoadBalancerElement",
responseObject = InternalLoadBalancerElementResponse.class,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java
index 777d7bb..a6ece72 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java
@@ -20,6 +20,8 @@ import java.util.List;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -31,8 +33,6 @@ import org.apache.cloudstack.api.response.ProviderResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.network.element.InternalLoadBalancerElementService;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.network.VirtualRouterProvider;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
index 1ec82d2..0e01be1 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.internallb;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -29,7 +31,6 @@ import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VpcResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.router.VirtualRouter.Role;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
index bb97fa5..df7135a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
@@ -21,6 +21,8 @@ import java.util.List;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -30,7 +32,6 @@ import org.apache.cloudstack.api.response.InternalLoadBalancerElementResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ProviderResponse;
import org.apache.cloudstack.network.element.InternalLoadBalancerElementService;
-import org.apache.log4j.Logger;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@@ -52,7 +53,10 @@ public class ListInternalLoadBalancerElementsCmd extends BaseListCmd {
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = InternalLoadBalancerElementResponse.class, description = "list internal load balancer elements by id")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = InternalLoadBalancerElementResponse.class,
+ description = "list internal load balancer elements by id")
private Long id;
@Parameter(name = ApiConstants.NSP_ID,
@@ -86,7 +90,8 @@ public class ListInternalLoadBalancerElementsCmd extends BaseListCmd {
}
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException {
List<? extends VirtualRouterProvider> providers = _service.searchForInternalLoadBalancerElements(getId(), getNspId(), getEnabled());
ListResponse<InternalLoadBalancerElementResponse> response = new ListResponse<InternalLoadBalancerElementResponse>();
List<InternalLoadBalancerElementResponse> providerResponses = new ArrayList<InternalLoadBalancerElementResponse>();
[51/54] [abbrv] [partial] git commit: updated refs/heads/reformat to
170f32f
Posted by ah...@apache.org.
Reformatted all of the code.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d620df2b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d620df2b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d620df2b
Branch: refs/heads/reformat
Commit: d620df2bdd3711c06f1388f1c59bf09c96e7b32a
Parents: eaa250f
Author: Alex Huang <al...@citrix.com>
Authored: Thu Nov 21 06:15:26 2013 -0800
Committer: Alex Huang <al...@citrix.com>
Committed: Thu Nov 21 06:15:26 2013 -0800
----------------------------------------------------------------------
agent/src/com/cloud/agent/Agent.java | 27 +-
agent/src/com/cloud/agent/AgentShell.java | 3 +
.../agent/dhcp/DhcpProtocolParserServer.java | 2 +-
agent/src/com/cloud/agent/dhcp/DhcpSnooper.java | 1 +
agent/src/com/cloud/agent/mockvm/MockVmMgr.java | 5 +-
agent/src/com/cloud/agent/mockvm/VmMgr.java | 4 +-
.../com/cloud/agent/resource/DummyResource.java | 29 +-
.../com/cloud/agent/api/to/FirewallRuleTO.java | 9 +-
.../com/cloud/agent/api/to/LoadBalancerTO.java | 41 +-
.../com/cloud/agent/api/to/NetworkACLTO.java | 5 +-
.../agent/api/to/PortForwardingRuleTO.java | 4 +-
api/src/com/cloud/agent/api/to/S3TO.java | 6 +-
api/src/com/cloud/agent/api/to/SwiftTO.java | 1 +
api/src/com/cloud/agent/api/to/TemplateTO.java | 1 +
.../cloud/agent/api/to/VirtualMachineTO.java | 4 +-
api/src/com/cloud/agent/api/to/VolumeTO.java | 1 +
.../configuration/ConfigurationService.java | 2 -
api/src/com/cloud/dc/DedicatedResources.java | 2 +
.../cloud/deploy/DeploymentClusterPlanner.java | 33 +-
api/src/com/cloud/domain/Domain.java | 1 +
api/src/com/cloud/event/ActionEvents.java | 5 +-
api/src/com/cloud/event/UsageEvent.java | 4 +-
.../exception/AgentControlChannelException.java | 2 -
api/src/com/cloud/host/Host.java | 21 +-
api/src/com/cloud/host/Status.java | 13 +-
api/src/com/cloud/network/GuestVlan.java | 1 +
.../com/cloud/network/MonitoringService.java | 1 +
.../network/NetworkMigrationResponder.java | 1 -
api/src/com/cloud/network/NetworkService.java | 19 +-
.../com/cloud/network/NetworkUsageService.java | 5 +-
api/src/com/cloud/network/PhysicalNetwork.java | 3 +-
.../network/PhysicalNetworkServiceProvider.java | 1 +
.../cloud/network/Site2SiteVpnConnection.java | 1 +
.../network/VirtualNetworkApplianceService.java | 6 +-
.../com/cloud/network/as/AutoScalePolicy.java | 1 +
.../com/cloud/network/as/AutoScaleVmGroup.java | 1 +
.../cloud/network/as/AutoScaleVmProfile.java | 1 +
.../network/element/DhcpServiceProvider.java | 5 +-
.../element/NetworkACLServiceProvider.java | 1 -
.../cloud/network/element/NetworkElement.java | 7 +-
.../element/UserDataServiceProvider.java | 1 -
api/src/com/cloud/network/guru/NetworkGuru.java | 11 +-
api/src/com/cloud/network/lb/CertService.java | 4 +-
.../com/cloud/network/lb/LoadBalancingRule.java | 11 +-
.../network/lb/LoadBalancingRulesService.java | 4 +-
.../cloud/network/rules/HealthCheckPolicy.java | 3 -
.../com/cloud/network/rules/RulesService.java | 4 +-
.../network/security/SecurityGroupService.java | 1 -
api/src/com/cloud/network/vpc/NetworkACL.java | 2 +-
.../com/cloud/network/vpc/NetworkACLItem.java | 6 +-
.../cloud/network/vpc/NetworkACLService.java | 7 +-
.../network/vpc/VpcProvisioningService.java | 7 +-
api/src/com/cloud/network/vpc/VpcService.java | 3 +-
api/src/com/cloud/projects/Project.java | 2 +
.../cloud/region/ha/GlobalLoadBalancerRule.java | 1 +
.../ha/GlobalLoadBalancingRulesService.java | 12 +-
api/src/com/cloud/resource/ResourceState.java | 13 +-
.../resource/UnableDeleteHostException.java | 2 +-
api/src/com/cloud/server/ManagementService.java | 3 +-
api/src/com/cloud/server/ResourceTag.java | 28 +-
api/src/com/cloud/storage/Snapshot.java | 3 +
api/src/com/cloud/storage/Storage.java | 13 +-
.../cloud/storage/StoragePoolDiscoverer.java | 3 +-
api/src/com/cloud/storage/Volume.java | 1 +
api/src/com/cloud/storage/VolumeApiService.java | 9 +-
.../storage/snapshot/SnapshotSchedule.java | 4 +-
api/src/com/cloud/user/Account.java | 1 +
api/src/com/cloud/user/AccountService.java | 7 +-
api/src/com/cloud/user/User.java | 1 +
api/src/com/cloud/user/UserAccount.java | 1 +
api/src/com/cloud/vm/DiskProfile.java | 3 +-
api/src/com/cloud/vm/NicIpAlias.java | 1 +
api/src/com/cloud/vm/NicProfile.java | 1 +
api/src/com/cloud/vm/NicSecondaryIp.java | 1 +
api/src/com/cloud/vm/UserVmService.java | 31 +-
api/src/com/cloud/vm/VirtualMachine.java | 19 +-
api/src/com/cloud/vm/snapshot/VMSnapshot.java | 15 +-
.../affinity/AffinityGroupResponse.java | 11 +-
.../affinity/AffinityGroupTypeResponse.java | 7 +-
.../org/apache/cloudstack/api/ApiErrorCode.java | 1 +
api/src/org/apache/cloudstack/api/BaseCmd.java | 28 +-
.../org/apache/cloudstack/api/BaseListCmd.java | 1 +
.../api/BaseListDomainResourcesCmd.java | 16 +-
.../BaseListTemplateOrIsoPermissionsCmd.java | 4 +-
.../org/apache/cloudstack/api/BaseResponse.java | 3 +-
.../api/BaseUpdateTemplateOrIsoCmd.java | 3 +-
.../BaseUpdateTemplateOrIsoPermissionsCmd.java | 3 +-
.../command/admin/account/CreateAccountCmd.java | 17 +-
.../command/admin/account/DeleteAccountCmd.java | 6 +-
.../admin/account/DisableAccountCmd.java | 4 +-
.../command/admin/account/EnableAccountCmd.java | 3 +-
.../command/admin/account/LockAccountCmd.java | 3 +-
.../command/admin/account/UpdateAccountCmd.java | 3 +-
.../admin/autoscale/CreateCounterCmd.java | 3 +-
.../admin/autoscale/DeleteCounterCmd.java | 3 +-
.../command/admin/cluster/AddClusterCmd.java | 3 +-
.../command/admin/cluster/DeleteClusterCmd.java | 3 +-
.../command/admin/cluster/ListClustersCmd.java | 3 +-
.../command/admin/cluster/UpdateClusterCmd.java | 3 +-
.../api/command/admin/config/ListCfgsByCmd.java | 11 +-
.../admin/config/ListDeploymentPlannersCmd.java | 3 +-
.../config/ListHypervisorCapabilitiesCmd.java | 12 +-
.../api/command/admin/config/UpdateCfgCmd.java | 10 +-
.../config/UpdateHypervisorCapabilitiesCmd.java | 13 +-
.../command/admin/domain/CreateDomainCmd.java | 4 +-
.../command/admin/domain/DeleteDomainCmd.java | 4 +-
.../admin/domain/ListDomainChildrenCmd.java | 3 +-
.../command/admin/domain/ListDomainsCmd.java | 3 +-
.../command/admin/domain/UpdateDomainCmd.java | 5 +-
.../api/command/admin/host/AddHostCmd.java | 3 +-
.../admin/host/AddSecondaryStorageCmd.java | 3 +-
.../admin/host/CancelMaintenanceCmd.java | 4 +-
.../api/command/admin/host/DeleteHostCmd.java | 3 +-
.../admin/host/FindHostsForMigrationCmd.java | 7 +-
.../api/command/admin/host/ListHostsCmd.java | 13 +-
.../admin/host/PrepareForMaintenanceCmd.java | 4 +-
.../command/admin/host/ReconnectHostCmd.java | 6 +-
.../admin/host/ReleaseHostReservationCmd.java | 4 +-
.../api/command/admin/host/UpdateHostCmd.java | 3 +-
.../admin/host/UpdateHostPasswordCmd.java | 3 +-
...ConfigureInternalLoadBalancerElementCmd.java | 22 +-
.../CreateInternalLoadBalancerElementCmd.java | 4 +-
.../admin/internallb/ListInternalLBVMsCmd.java | 3 +-
.../ListInternalLoadBalancerElementsCmd.java | 11 +-
.../admin/internallb/StartInternalLBVMCmd.java | 6 +-
.../admin/internallb/StopInternalLBVMCmd.java | 4 +-
.../admin/network/AddNetworkDeviceCmd.java | 6 +-
.../network/AddNetworkServiceProviderCmd.java | 13 +-
.../admin/network/CreateNetworkOfferingCmd.java | 19 +-
.../admin/network/CreatePhysicalNetworkCmd.java | 20 +-
.../network/CreateStorageNetworkIpRangeCmd.java | 17 +-
.../network/DedicateGuestVlanRangeCmd.java | 18 +-
.../admin/network/DeleteNetworkDeviceCmd.java | 6 +-
.../admin/network/DeleteNetworkOfferingCmd.java | 9 +-
.../DeleteNetworkServiceProviderCmd.java | 9 +-
.../admin/network/DeletePhysicalNetworkCmd.java | 10 +-
.../network/DeleteStorageNetworkIpRangeCmd.java | 6 +-
.../ListDedicatedGuestVlanRangesCmd.java | 22 +-
.../admin/network/ListNetworkDeviceCmd.java | 6 +-
.../network/ListNetworkIsolationMethodsCmd.java | 5 +-
.../network/ListNetworkServiceProvidersCmd.java | 7 +-
.../admin/network/ListPhysicalNetworksCmd.java | 7 +-
.../network/ListStorageNetworkIpRangeCmd.java | 6 +-
.../ListSupportedNetworkServicesCmd.java | 3 +-
.../ReleaseDedicatedGuestVlanRangeCmd.java | 16 +-
.../admin/network/UpdateNetworkOfferingCmd.java | 12 +-
.../UpdateNetworkServiceProviderCmd.java | 3 +-
.../admin/network/UpdatePhysicalNetworkCmd.java | 3 +-
.../network/UpdateStorageNetworkIpRangeCmd.java | 12 +-
.../admin/offering/CreateDiskOfferingCmd.java | 7 +-
.../offering/CreateServiceOfferingCmd.java | 3 +-
.../admin/offering/DeleteDiskOfferingCmd.java | 4 +-
.../offering/DeleteServiceOfferingCmd.java | 9 +-
.../admin/offering/UpdateDiskOfferingCmd.java | 12 +-
.../offering/UpdateServiceOfferingCmd.java | 3 +-
.../api/command/admin/pod/CreatePodCmd.java | 9 +-
.../api/command/admin/pod/DeletePodCmd.java | 4 +-
.../api/command/admin/pod/ListPodsByCmd.java | 3 +-
.../api/command/admin/pod/UpdatePodCmd.java | 3 +-
.../api/command/admin/region/AddRegionCmd.java | 3 +-
.../admin/region/CreatePortableIpRangeCmd.java | 19 +-
.../admin/region/DeletePortableIpRangeCmd.java | 16 +-
.../admin/region/ListPortableIpRangesCmd.java | 17 +-
.../command/admin/region/RemoveRegionCmd.java | 3 +-
.../command/admin/region/UpdateRegionCmd.java | 3 +-
.../admin/resource/ArchiveAlertsCmd.java | 19 +-
.../admin/resource/CleanVMReservationsCmd.java | 4 +-
.../command/admin/resource/DeleteAlertsCmd.java | 19 +-
.../command/admin/resource/ListAlertsCmd.java | 3 +-
.../command/admin/resource/ListCapacityCmd.java | 15 +-
.../resource/UploadCustomCertificateCmd.java | 9 +-
.../ConfigureVirtualRouterElementCmd.java | 6 +-
.../router/CreateVirtualRouterElementCmd.java | 4 +-
.../command/admin/router/DestroyRouterCmd.java | 4 +-
.../command/admin/router/ListRoutersCmd.java | 3 +-
.../router/ListVirtualRouterElementsCmd.java | 6 +-
.../command/admin/router/RebootRouterCmd.java | 6 +-
.../command/admin/router/StartRouterCmd.java | 6 +-
.../api/command/admin/router/StopRouterCmd.java | 4 +-
.../command/admin/router/UpgradeRouterCmd.java | 3 +-
.../admin/router/UpgradeRouterTemplateCmd.java | 31 +-
.../command/admin/storage/AddImageStoreCmd.java | 3 +-
.../api/command/admin/storage/AddS3Cmd.java | 7 +-
.../CancelPrimaryStorageMaintenanceCmd.java | 4 +-
.../storage/CreateSecondaryStagingStoreCmd.java | 16 +-
.../admin/storage/CreateStoragePoolCmd.java | 3 +-
.../admin/storage/DeleteImageStoreCmd.java | 4 +-
.../command/admin/storage/DeletePoolCmd.java | 8 +-
.../storage/DeleteSecondaryStagingStoreCmd.java | 3 +-
.../FindStoragePoolsForMigrationCmd.java | 13 +-
.../admin/storage/ListImageStoresCmd.java | 3 +-
.../api/command/admin/storage/ListS3sCmd.java | 5 +-
.../storage/ListSecondaryStagingStoresCmd.java | 3 +-
.../admin/storage/ListStoragePoolsCmd.java | 8 +-
.../admin/storage/ListStorageProvidersCmd.java | 7 +-
.../PreparePrimaryStorageForMaintenanceCmd.java | 4 +-
.../admin/storage/UpdateStoragePoolCmd.java | 3 +-
.../api/command/admin/swift/AddSwiftCmd.java | 3 +-
.../api/command/admin/swift/ListSwiftsCmd.java | 3 +-
.../admin/systemvm/DestroySystemVmCmd.java | 10 +-
.../admin/systemvm/ListSystemVMsCmd.java | 8 +-
.../admin/systemvm/MigrateSystemVMCmd.java | 34 +-
.../admin/systemvm/RebootSystemVmCmd.java | 12 +-
.../admin/systemvm/ScaleSystemVMCmd.java | 6 +-
.../admin/systemvm/StartSystemVMCmd.java | 12 +-
.../command/admin/systemvm/StopSystemVmCmd.java | 10 +-
.../admin/systemvm/UpgradeSystemVMCmd.java | 2 +-
.../admin/template/PrepareTemplateCmd.java | 3 +-
.../admin/usage/AddTrafficMonitorCmd.java | 3 +-
.../command/admin/usage/AddTrafficTypeCmd.java | 9 +-
.../admin/usage/DeleteTrafficMonitorCmd.java | 3 +-
.../admin/usage/DeleteTrafficTypeCmd.java | 3 +-
.../admin/usage/GenerateUsageRecordsCmd.java | 9 +-
.../command/admin/usage/GetUsageRecordsCmd.java | 3 +-
.../admin/usage/ListTrafficMonitorsCmd.java | 3 +-
.../usage/ListTrafficTypeImplementorsCmd.java | 6 +-
.../admin/usage/ListTrafficTypesCmd.java | 3 +-
.../command/admin/usage/ListUsageTypesCmd.java | 4 +-
.../admin/usage/UpdateTrafficTypeCmd.java | 4 +-
.../api/command/admin/user/CreateUserCmd.java | 9 +-
.../api/command/admin/user/DeleteUserCmd.java | 4 +-
.../api/command/admin/user/DisableUserCmd.java | 5 +-
.../api/command/admin/user/EnableUserCmd.java | 4 +-
.../api/command/admin/user/GetUserCmd.java | 3 +-
.../api/command/admin/user/ListUsersCmd.java | 3 +-
.../api/command/admin/user/LockUserCmd.java | 3 +-
.../api/command/admin/user/RegisterCmd.java | 4 +-
.../api/command/admin/user/UpdateUserCmd.java | 4 +-
.../admin/vlan/CreateVlanIpRangeCmd.java | 11 +-
.../admin/vlan/DedicatePublicIpRangeCmd.java | 10 +-
.../admin/vlan/DeleteVlanIpRangeCmd.java | 3 +-
.../command/admin/vlan/ListVlanIpRangesCmd.java | 3 +-
.../admin/vlan/ReleasePublicIpRangeCmd.java | 3 +-
.../api/command/admin/vm/AssignVMCmd.java | 10 +-
.../api/command/admin/vm/ExpungeVMCmd.java | 5 +-
.../api/command/admin/vm/MigrateVMCmd.java | 10 +-
.../vm/MigrateVirtualMachineWithVolumeCmd.java | 32 +-
.../api/command/admin/vm/RecoverVMCmd.java | 3 +-
.../admin/vpc/CreatePrivateGatewayCmd.java | 8 +-
.../command/admin/vpc/CreateVPCOfferingCmd.java | 5 +-
.../admin/vpc/DeletePrivateGatewayCmd.java | 4 +-
.../command/admin/vpc/DeleteVPCOfferingCmd.java | 3 +-
.../command/admin/vpc/UpdateVPCOfferingCmd.java | 3 +-
.../api/command/admin/zone/CreateZoneCmd.java | 9 +-
.../api/command/admin/zone/DeleteZoneCmd.java | 4 +-
.../zone/MarkDefaultZoneForAccountCmd.java | 3 +-
.../api/command/admin/zone/UpdateZoneCmd.java | 4 +-
.../user/account/AddAccountToProjectCmd.java | 4 +-
.../account/DeleteAccountFromProjectCmd.java | 4 +-
.../command/user/account/ListAccountsCmd.java | 3 +-
.../user/account/ListProjectAccountsCmd.java | 3 +-
.../user/address/AssociateIPAddrCmd.java | 24 +-
.../user/address/DisassociateIPAddrCmd.java | 6 +-
.../user/address/ListPublicIpAddressesCmd.java | 4 +-
.../affinitygroup/CreateAffinityGroupCmd.java | 9 +-
.../affinitygroup/DeleteAffinityGroupCmd.java | 9 +-
.../ListAffinityGroupTypesCmd.java | 4 +-
.../affinitygroup/ListAffinityGroupsCmd.java | 13 +-
.../affinitygroup/UpdateVMAffinityGroupCmd.java | 12 +-
.../autoscale/CreateAutoScalePolicyCmd.java | 3 +-
.../autoscale/CreateAutoScaleVmGroupCmd.java | 9 +-
.../autoscale/CreateAutoScaleVmProfileCmd.java | 4 +-
.../user/autoscale/CreateConditionCmd.java | 4 +-
.../autoscale/DeleteAutoScalePolicyCmd.java | 10 +-
.../autoscale/DeleteAutoScaleVmGroupCmd.java | 10 +-
.../autoscale/DeleteAutoScaleVmProfileCmd.java | 10 +-
.../user/autoscale/DeleteConditionCmd.java | 3 +-
.../autoscale/DisableAutoScaleVmGroupCmd.java | 9 +-
.../autoscale/EnableAutoScaleVmGroupCmd.java | 9 +-
.../autoscale/ListAutoScalePoliciesCmd.java | 7 +-
.../autoscale/ListAutoScaleVmGroupsCmd.java | 3 +-
.../autoscale/ListAutoScaleVmProfilesCmd.java | 3 +-
.../user/autoscale/ListConditionsCmd.java | 16 +-
.../command/user/autoscale/ListCountersCmd.java | 3 +-
.../autoscale/UpdateAutoScalePolicyCmd.java | 10 +-
.../autoscale/UpdateAutoScaleVmGroupCmd.java | 10 +-
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 15 +-
.../command/user/event/ArchiveEventsCmd.java | 20 +-
.../api/command/user/event/DeleteEventsCmd.java | 20 +-
.../command/user/event/ListEventTypesCmd.java | 4 +-
.../api/command/user/event/ListEventsCmd.java | 3 +-
.../firewall/CreateEgressFirewallRuleCmd.java | 10 +-
.../user/firewall/CreateFirewallRuleCmd.java | 12 +-
.../firewall/CreatePortForwardingRuleCmd.java | 49 +-
.../firewall/DeleteEgressFirewallRuleCmd.java | 4 +-
.../user/firewall/DeleteFirewallRuleCmd.java | 4 +-
.../firewall/DeletePortForwardingRuleCmd.java | 6 +-
.../firewall/ListEgressFirewallRulesCmd.java | 13 +-
.../user/firewall/ListFirewallRulesCmd.java | 14 +-
.../firewall/ListPortForwardingRulesCmd.java | 3 +-
.../firewall/UpdatePortForwardingRuleCmd.java | 8 +-
.../user/guest/ListGuestOsCategoriesCmd.java | 3 +-
.../api/command/user/guest/ListGuestOsCmd.java | 3 +-
.../api/command/user/iso/AttachIsoCmd.java | 10 +-
.../api/command/user/iso/CopyIsoCmd.java | 3 +-
.../api/command/user/iso/DeleteIsoCmd.java | 6 +-
.../api/command/user/iso/DetachIsoCmd.java | 10 +-
.../api/command/user/iso/ExtractIsoCmd.java | 7 +-
.../command/user/iso/ListIsoPermissionsCmd.java | 4 +-
.../api/command/user/iso/ListIsosCmd.java | 26 +-
.../api/command/user/iso/RegisterIsoCmd.java | 4 +-
.../api/command/user/iso/UpdateIsoCmd.java | 3 +-
.../user/iso/UpdateIsoPermissionsCmd.java | 5 +-
.../user/job/QueryAsyncJobResultCmd.java | 3 +-
.../AssignCertToLoadBalancerCmd.java | 39 +-
.../AssignToLoadBalancerRuleCmd.java | 10 +-
.../CreateApplicationLoadBalancerCmd.java | 19 +-
.../CreateLBHealthCheckPolicyCmd.java | 22 +-
.../CreateLBStickinessPolicyCmd.java | 10 +-
.../loadbalancer/CreateLoadBalancerRuleCmd.java | 30 +-
.../DeleteApplicationLoadBalancerCmd.java | 4 +-
.../DeleteLBHealthCheckPolicyCmd.java | 5 +-
.../DeleteLBStickinessPolicyCmd.java | 10 +-
.../loadbalancer/DeleteLoadBalancerRuleCmd.java | 10 +-
.../user/loadbalancer/DeleteSslCertCmd.java | 26 +-
.../ListApplicationLoadBalancersCmd.java | 11 +-
.../ListLBHealthCheckPoliciesCmd.java | 14 +-
.../ListLBStickinessPoliciesCmd.java | 10 +-
.../ListLoadBalancerRuleInstancesCmd.java | 10 +-
.../loadbalancer/ListLoadBalancerRulesCmd.java | 8 +-
.../user/loadbalancer/ListSslCertsCmd.java | 17 +-
.../RemoveCertFromLoadBalancerCmd.java | 31 +-
.../RemoveFromLoadBalancerRuleCmd.java | 10 +-
.../loadbalancer/UpdateLoadBalancerRuleCmd.java | 4 +-
.../user/loadbalancer/UploadSslCertCmd.java | 25 +-
.../user/nat/CreateIpForwardingRuleCmd.java | 4 +-
.../command/user/nat/DisableStaticNatCmd.java | 3 +-
.../command/user/nat/EnableStaticNatCmd.java | 26 +-
.../user/nat/ListIpForwardingRulesCmd.java | 18 +-
.../user/network/CreateNetworkACLCmd.java | 16 +-
.../command/user/network/CreateNetworkCmd.java | 21 +-
.../command/user/network/DeleteNetworkCmd.java | 4 +-
.../user/network/ListNetworkACLListsCmd.java | 12 +-
.../user/network/ListNetworkACLsCmd.java | 12 +-
.../user/network/ListNetworkOfferingsCmd.java | 7 +-
.../command/user/network/ListNetworksCmd.java | 17 +-
.../user/network/ReplaceNetworkACLListCmd.java | 18 +-
.../command/user/network/RestartNetworkCmd.java | 4 +-
.../user/network/UpdateNetworkACLItemCmd.java | 43 +-
.../command/user/network/UpdateNetworkCmd.java | 13 +-
.../user/offering/ListDiskOfferingsCmd.java | 7 +-
.../user/offering/ListServiceOfferingsCmd.java | 13 +-
.../user/project/ActivateProjectCmd.java | 4 +-
.../command/user/project/CreateProjectCmd.java | 4 +-
.../command/user/project/DeleteProjectCmd.java | 4 +-
.../project/DeleteProjectInvitationCmd.java | 4 +-
.../user/project/ListProjectInvitationsCmd.java | 3 +-
.../command/user/project/ListProjectsCmd.java | 8 +-
.../command/user/project/SuspendProjectCmd.java | 4 +-
.../command/user/project/UpdateProjectCmd.java | 4 +-
.../project/UpdateProjectInvitationCmd.java | 8 +-
.../api/command/user/region/ListRegionsCmd.java | 3 +-
.../gslb/AssignToGlobalLoadBalancerRuleCmd.java | 43 +-
.../gslb/CreateGlobalLoadBalancerRuleCmd.java | 26 +-
.../gslb/DeleteGlobalLoadBalancerRuleCmd.java | 22 +-
.../ha/gslb/ListGlobalLoadBalancerRuleCmd.java | 15 +-
.../RemoveFromGlobalLoadBalancerRuleCmd.java | 38 +-
.../gslb/UpdateGlobalLoadBalancerRuleCmd.java | 20 +-
.../user/resource/GetCloudIdentifierCmd.java | 10 +-
.../user/resource/ListHypervisorsCmd.java | 3 +-
.../user/resource/ListResourceLimitsCmd.java | 27 +-
.../user/resource/UpdateResourceCountCmd.java | 31 +-
.../user/resource/UpdateResourceLimitCmd.java | 16 +-
.../AuthorizeSecurityGroupEgressCmd.java | 4 +-
.../AuthorizeSecurityGroupIngressCmd.java | 9 +-
.../securitygroup/CreateSecurityGroupCmd.java | 4 +-
.../securitygroup/DeleteSecurityGroupCmd.java | 9 +-
.../securitygroup/ListSecurityGroupsCmd.java | 8 +-
.../RevokeSecurityGroupEgressCmd.java | 8 +-
.../RevokeSecurityGroupIngressCmd.java | 3 +-
.../user/snapshot/CreateSnapshotCmd.java | 14 +-
.../user/snapshot/CreateSnapshotPolicyCmd.java | 10 +-
.../user/snapshot/DeleteSnapshotCmd.java | 6 +-
.../snapshot/DeleteSnapshotPoliciesCmd.java | 3 +-
.../user/snapshot/ListSnapshotPoliciesCmd.java | 3 +-
.../command/user/snapshot/ListSnapshotsCmd.java | 4 +-
.../command/user/ssh/CreateSSHKeyPairCmd.java | 4 +-
.../command/user/ssh/DeleteSSHKeyPairCmd.java | 4 +-
.../command/user/ssh/ListSSHKeyPairsCmd.java | 3 +-
.../command/user/ssh/RegisterSSHKeyPairCmd.java | 4 +-
.../api/command/user/tag/CreateTagsCmd.java | 5 +-
.../api/command/user/tag/DeleteTagsCmd.java | 9 +-
.../command/user/template/CopyTemplateCmd.java | 7 +-
.../user/template/CreateTemplateCmd.java | 47 +-
.../user/template/DeleteTemplateCmd.java | 6 +-
.../user/template/ExtractTemplateCmd.java | 7 +-
.../template/ListTemplatePermissionsCmd.java | 4 +-
.../command/user/template/ListTemplatesCmd.java | 27 +-
.../user/template/RegisterTemplateCmd.java | 13 +-
.../user/template/UpdateTemplateCmd.java | 3 +-
.../template/UpdateTemplatePermissionsCmd.java | 13 +-
.../api/command/user/vm/AddIpToVmNicCmd.java | 5 +-
.../api/command/user/vm/AddNicToVMCmd.java | 13 +-
.../api/command/user/vm/DeployVMCmd.java | 59 +-
.../api/command/user/vm/DestroyVMCmd.java | 5 +-
.../api/command/user/vm/GetVMPasswordCmd.java | 3 +-
.../api/command/user/vm/ListNicsCmd.java | 1 -
.../api/command/user/vm/ListVMsCmd.java | 12 +-
.../api/command/user/vm/RebootVMCmd.java | 7 +-
.../command/user/vm/RemoveIpFromVmNicCmd.java | 2 -
.../api/command/user/vm/RemoveNicFromVMCmd.java | 13 +-
.../api/command/user/vm/ResetVMPasswordCmd.java | 12 +-
.../api/command/user/vm/ResetVMSSHKeyCmd.java | 13 +-
.../api/command/user/vm/RestoreVMCmd.java | 12 +-
.../api/command/user/vm/ScaleVMCmd.java | 26 +-
.../api/command/user/vm/StartVMCmd.java | 6 +-
.../api/command/user/vm/StopVMCmd.java | 11 +-
.../user/vm/UpdateDefaultNicForVMCmd.java | 13 +-
.../api/command/user/vm/UpdateVMCmd.java | 13 +-
.../api/command/user/vm/UpgradeVMCmd.java | 3 +-
.../command/user/vmgroup/CreateVMGroupCmd.java | 10 +-
.../command/user/vmgroup/DeleteVMGroupCmd.java | 3 +-
.../command/user/vmgroup/ListVMGroupsCmd.java | 3 +-
.../command/user/vmgroup/UpdateVMGroupCmd.java | 3 +-
.../user/vmsnapshot/DeleteVMSnapshotCmd.java | 10 +-
.../user/vmsnapshot/RevertToVMSnapshotCmd.java | 6 +-
.../command/user/volume/AttachVolumeCmd.java | 12 +-
.../command/user/volume/CreateVolumeCmd.java | 10 +-
.../command/user/volume/DeleteVolumeCmd.java | 4 +-
.../command/user/volume/DetachVolumeCmd.java | 6 +-
.../command/user/volume/ExtractVolumeCmd.java | 6 +-
.../user/volume/ListResourceDetailsCmd.java | 2 +-
.../api/command/user/volume/ListVolumesCmd.java | 3 +-
.../command/user/volume/MigrateVolumeCmd.java | 1 -
.../user/volume/RemoveResourceDetailCmd.java | 10 +-
.../command/user/volume/ResizeVolumeCmd.java | 13 +-
.../command/user/volume/UpdateVolumeCmd.java | 9 +-
.../command/user/volume/UploadVolumeCmd.java | 14 +-
.../api/command/user/vpc/CreateVPCCmd.java | 17 +-
.../command/user/vpc/DeleteStaticRouteCmd.java | 4 +-
.../api/command/user/vpc/DeleteVPCCmd.java | 3 +-
.../user/vpc/ListPrivateGatewaysCmd.java | 3 +-
.../command/user/vpc/ListVPCOfferingsCmd.java | 13 +-
.../api/command/user/vpc/ListVPCsCmd.java | 14 +-
.../api/command/user/vpc/RestartVPCCmd.java | 3 +-
.../api/command/user/vpc/UpdateVPCCmd.java | 3 +-
.../api/command/user/vpn/AddVpnUserCmd.java | 4 +-
.../user/vpn/CreateRemoteAccessVpnCmd.java | 3 +-
.../user/vpn/CreateVpnCustomerGatewayCmd.java | 16 +-
.../command/user/vpn/CreateVpnGatewayCmd.java | 6 +-
.../user/vpn/DeleteRemoteAccessVpnCmd.java | 4 +-
.../user/vpn/DeleteVpnConnectionCmd.java | 3 +-
.../user/vpn/DeleteVpnCustomerGatewayCmd.java | 9 +-
.../command/user/vpn/DeleteVpnGatewayCmd.java | 3 +-
.../user/vpn/ListRemoteAccessVpnsCmd.java | 3 +-
.../command/user/vpn/ListVpnConnectionsCmd.java | 3 +-
.../user/vpn/ListVpnCustomerGatewaysCmd.java | 3 +-
.../command/user/vpn/ListVpnGatewaysCmd.java | 3 +-
.../api/command/user/vpn/ListVpnUsersCmd.java | 3 +-
.../api/command/user/vpn/RemoveVpnUserCmd.java | 4 +-
.../command/user/vpn/ResetVpnConnectionCmd.java | 4 +-
.../user/vpn/UpdateVpnCustomerGatewayCmd.java | 22 +-
.../api/command/user/zone/ListZonesByCmd.java | 5 +-
.../api/response/AddIpToVmNicResponse.java | 4 +-
.../cloudstack/api/response/AlertResponse.java | 14 +-
...ApplicationLoadBalancerInstanceResponse.java | 3 +-
.../ApplicationLoadBalancerResponse.java | 7 +-
.../ApplicationLoadBalancerRuleResponse.java | 3 +-
.../api/response/AutoScalePolicyResponse.java | 3 +-
.../api/response/AutoScaleVmGroupResponse.java | 3 +-
.../response/AutoScaleVmProfileResponse.java | 3 +-
.../api/response/CapabilityResponse.java | 3 +-
.../api/response/CapacityResponse.java | 3 +-
.../api/response/CloudIdentifierResponse.java | 3 +-
.../api/response/ClusterResponse.java | 10 +-
.../api/response/ConditionResponse.java | 3 +-
.../api/response/ConfigurationResponse.java | 3 +-
.../api/response/CounterResponse.java | 3 +-
.../api/response/CreateSSHKeyPairResponse.java | 3 +-
.../api/response/CustomCertificateResponse.java | 3 +-
.../response/DeploymentPlannersResponse.java | 3 +-
.../api/response/DiskOfferingResponse.java | 3 +-
.../cloudstack/api/response/DomainResponse.java | 3 +-
.../api/response/DomainRouterResponse.java | 4 +-
.../cloudstack/api/response/EventResponse.java | 3 +-
.../api/response/EventTypeResponse.java | 3 +-
.../api/response/ExceptionResponse.java | 3 +-
.../api/response/ExternalFirewallResponse.java | 5 +-
.../response/ExternalLoadBalancerResponse.java | 5 +-
.../api/response/ExtractResponse.java | 3 +-
.../api/response/FirewallResponse.java | 3 +-
.../api/response/FirewallRuleResponse.java | 3 +-
.../api/response/GetVMPasswordResponse.java | 3 +-
.../response/GlobalLoadBalancerResponse.java | 10 +-
.../api/response/GuestOSCategoryResponse.java | 3 +-
.../api/response/GuestOSResponse.java | 3 +-
.../api/response/GuestVlanRangeResponse.java | 8 +-
.../api/response/HostForMigrationResponse.java | 3 +-
.../cloudstack/api/response/HostResponse.java | 3 +-
.../HypervisorCapabilitiesResponse.java | 3 +-
.../api/response/HypervisorResponse.java | 3 +-
.../api/response/IPAddressResponse.java | 3 +-
.../api/response/ImageStoreDetailResponse.java | 3 +-
.../api/response/ImageStoreResponse.java | 3 +-
.../api/response/InstanceGroupResponse.java | 3 +-
.../InternalLoadBalancerElementResponse.java | 3 +-
.../api/response/IpForwardingRuleResponse.java | 3 +-
.../cloudstack/api/response/IsoVmResponse.java | 3 +-
.../api/response/IsolationMethodResponse.java | 3 +-
.../response/LBHealthCheckPolicyResponse.java | 6 +-
.../api/response/LBHealthCheckResponse.java | 11 +-
.../response/LBStickinessPolicyResponse.java | 3 +-
.../api/response/LBStickinessResponse.java | 3 +-
.../api/response/LoadBalancerResponse.java | 5 +-
.../api/response/NetworkACLItemResponse.java | 7 +-
.../api/response/NetworkACLResponse.java | 6 +-
.../api/response/NetworkDeviceResponse.java | 3 +-
.../api/response/NetworkOfferingResponse.java | 3 +-
.../api/response/NetworkResponse.java | 5 +-
.../api/response/NicDetailResponse.java | 7 +-
.../cloudstack/api/response/NicResponse.java | 8 +-
.../api/response/NicSecondaryIpResponse.java | 5 +-
.../api/response/PhysicalNetworkResponse.java | 3 +-
.../cloudstack/api/response/PodResponse.java | 3 +-
.../api/response/PortableIpRangeResponse.java | 7 +-
.../api/response/PortableIpResponse.java | 8 +-
.../api/response/PrivateGatewayResponse.java | 3 +-
.../api/response/ProjectAccountResponse.java | 8 +-
.../api/response/ProjectInvitationResponse.java | 8 +-
.../api/response/ProviderResponse.java | 3 +-
.../cloudstack/api/response/RegionResponse.java | 3 +-
.../api/response/RegisterResponse.java | 3 +-
.../api/response/RemoteAccessVpnResponse.java | 5 +-
.../api/response/ResourceCountResponse.java | 3 +-
.../api/response/ResourceDetailResponse.java | 3 +-
.../api/response/ResourceLimitResponse.java | 3 +-
.../api/response/ResourceTagResponse.java | 3 +-
.../api/response/SSHKeyPairResponse.java | 3 +-
.../api/response/SecurityGroupResponse.java | 6 +-
.../api/response/SecurityGroupRuleResponse.java | 3 +-
.../api/response/ServiceOfferingResponse.java | 3 +-
.../api/response/ServiceResponse.java | 6 +-
.../Site2SiteCustomerGatewayResponse.java | 3 +-
.../Site2SiteVpnConnectionResponse.java | 3 +-
.../response/Site2SiteVpnGatewayResponse.java | 3 +-
.../api/response/SnapshotPolicyResponse.java | 3 +-
.../api/response/SnapshotResponse.java | 3 +-
.../api/response/SnapshotScheduleResponse.java | 3 +-
.../api/response/SslCertResponse.java | 8 +-
.../api/response/StaticRouteResponse.java | 3 +-
.../cloudstack/api/response/StatusResponse.java | 4 +-
.../response/StorageNetworkIpRangeResponse.java | 3 +-
.../api/response/StoragePoolResponse.java | 12 +-
.../api/response/StorageProviderResponse.java | 3 +-
.../api/response/SuccessResponse.java | 3 +-
.../api/response/SystemVmInstanceResponse.java | 3 +-
.../api/response/SystemVmResponse.java | 3 +-
.../response/TemplatePermissionsResponse.java | 3 +-
.../api/response/TemplateResponse.java | 3 +-
.../api/response/TemplateZoneResponse.java | 3 +-
.../api/response/TrafficMonitorResponse.java | 3 +-
.../TrafficTypeImplementorResponse.java | 3 +-
.../api/response/TrafficTypeResponse.java | 3 +-
.../response/UpgradeRouterTemplateResponse.java | 8 +-
.../api/response/UpgradeVmResponse.java | 3 +-
.../api/response/UsageRecordResponse.java | 3 +-
.../api/response/UsageTypeResponse.java | 3 +-
.../cloudstack/api/response/UserResponse.java | 3 +-
.../cloudstack/api/response/UserVmResponse.java | 3 +-
.../api/response/VMSnapshotResponse.java | 3 +-
.../response/VirtualRouterProviderResponse.java | 3 +-
.../api/response/VlanIpRangeResponse.java | 6 +-
.../api/response/VolumeDetailResponse.java | 8 +-
.../cloudstack/api/response/VolumeResponse.java | 5 +-
.../api/response/VpcOfferingResponse.java | 3 +-
.../cloudstack/api/response/VpcResponse.java | 3 +-
.../api/response/VpnUsersResponse.java | 5 +-
.../cloudstack/api/response/ZoneResponse.java | 3 +-
.../apache/cloudstack/context/CallContext.java | 11 +-
.../apache/cloudstack/query/QueryService.java | 33 +-
.../apache/cloudstack/region/PortableIp.java | 1 -
api/test/com/cloud/network/NetworksTest.java | 1 -
.../command/test/ActivateProjectCmdTest.java | 11 +-
.../test/AddAccountToProjectCmdTest.java | 9 +-
.../api/command/test/AddIpToVmNicTest.java | 31 +-
.../test/AddNetworkServiceProviderCmdTest.java | 12 +-
.../test/AddSecondaryStorageCmdTest.java | 10 +-
.../api/command/test/AddVpnUserCmdTest.java | 15 +-
.../api/command/test/ListCfgCmdTest.java | 25 +-
.../api/command/test/RegionCmdTest.java | 17 +-
.../api/command/test/ScaleVMCmdTest.java | 19 +-
.../api/command/test/UpdateCfgCmdTest.java | 18 +-
.../api/command/test/UsageCmdTest.java | 8 +-
awsapi/src/com/amazon/ec2/ActivateLicense.java | 11 +-
.../com/amazon/ec2/ActivateLicenseResponse.java | 8 +-
.../amazon/ec2/ActivateLicenseResponseType.java | 8 +-
.../src/com/amazon/ec2/ActivateLicenseType.java | 8 +-
awsapi/src/com/amazon/ec2/AllocateAddress.java | 11 +-
.../com/amazon/ec2/AllocateAddressResponse.java | 8 +-
.../amazon/ec2/AllocateAddressResponseType.java | 8 +-
.../src/com/amazon/ec2/AllocateAddressType.java | 8 +-
.../com/amazon/ec2/AllocationIdSetItemType.java | 8 +-
.../src/com/amazon/ec2/AllocationIdSetType.java | 8 +-
.../ec2/AmazonEC2MessageReceiverInOut.java | 1434 +-
.../src/com/amazon/ec2/AmazonEC2Skeleton.java | 22 +-
.../amazon/ec2/AmazonEC2SkeletonInterface.java | 22 +-
.../amazon/ec2/AssignPrivateIpAddresses.java | 8 +-
.../ec2/AssignPrivateIpAddressesResponse.java | 11 +-
.../AssignPrivateIpAddressesResponseType.java | 8 +-
...ignPrivateIpAddressesSetItemRequestType.java | 8 +-
.../AssignPrivateIpAddressesSetRequestType.java | 11 +-
.../ec2/AssignPrivateIpAddressesType.java | 14 +-
awsapi/src/com/amazon/ec2/AssociateAddress.java | 11 +-
.../amazon/ec2/AssociateAddressResponse.java | 8 +-
.../ec2/AssociateAddressResponseType.java | 8 +-
.../com/amazon/ec2/AssociateAddressType.java | 8 +-
.../ec2/AssociateAddressTypeChoice_type0.java | 8 +-
.../ec2/AssociateAddressTypeChoice_type1.java | 8 +-
.../com/amazon/ec2/AssociateDhcpOptions.java | 11 +-
.../ec2/AssociateDhcpOptionsResponse.java | 11 +-
.../ec2/AssociateDhcpOptionsResponseType.java | 8 +-
.../amazon/ec2/AssociateDhcpOptionsType.java | 8 +-
.../src/com/amazon/ec2/AssociateRouteTable.java | 11 +-
.../amazon/ec2/AssociateRouteTableResponse.java | 11 +-
.../ec2/AssociateRouteTableResponseType.java | 8 +-
.../com/amazon/ec2/AssociateRouteTableType.java | 8 +-
.../com/amazon/ec2/AttachInternetGateway.java | 11 +-
.../ec2/AttachInternetGatewayResponse.java | 11 +-
.../ec2/AttachInternetGatewayResponseType.java | 8 +-
.../amazon/ec2/AttachInternetGatewayType.java | 8 +-
.../com/amazon/ec2/AttachNetworkInterface.java | 11 +-
.../ec2/AttachNetworkInterfaceResponse.java | 11 +-
.../ec2/AttachNetworkInterfaceResponseType.java | 8 +-
.../amazon/ec2/AttachNetworkInterfaceType.java | 8 +-
awsapi/src/com/amazon/ec2/AttachVolume.java | 8 +-
.../com/amazon/ec2/AttachVolumeResponse.java | 11 +-
.../amazon/ec2/AttachVolumeResponseType.java | 8 +-
awsapi/src/com/amazon/ec2/AttachVolumeType.java | 8 +-
awsapi/src/com/amazon/ec2/AttachVpnGateway.java | 11 +-
.../amazon/ec2/AttachVpnGatewayResponse.java | 8 +-
.../ec2/AttachVpnGatewayResponseType.java | 8 +-
.../com/amazon/ec2/AttachVpnGatewayType.java | 8 +-
.../ec2/AttachmentSetItemResponseType.java | 8 +-
.../amazon/ec2/AttachmentSetResponseType.java | 8 +-
.../src/com/amazon/ec2/AttachmentSetType.java | 11 +-
awsapi/src/com/amazon/ec2/AttachmentType.java | 8 +-
.../amazon/ec2/AttributeBooleanValueType.java | 8 +-
.../src/com/amazon/ec2/AttributeValueType.java | 8 +-
.../ec2/AuthorizeSecurityGroupEgress.java | 11 +-
.../AuthorizeSecurityGroupEgressResponse.java | 12 +-
...uthorizeSecurityGroupEgressResponseType.java | 8 +-
.../ec2/AuthorizeSecurityGroupEgressType.java | 8 +-
.../ec2/AuthorizeSecurityGroupIngress.java | 11 +-
.../AuthorizeSecurityGroupIngressResponse.java | 12 +-
...thorizeSecurityGroupIngressResponseType.java | 8 +-
.../ec2/AuthorizeSecurityGroupIngressType.java | 8 +-
...izeSecurityGroupIngressTypeChoice_type0.java | 8 +-
.../amazon/ec2/AvailabilityZoneItemType.java | 8 +-
.../ec2/AvailabilityZoneMessageSetType.java | 8 +-
.../amazon/ec2/AvailabilityZoneMessageType.java | 8 +-
.../com/amazon/ec2/AvailabilityZoneSetType.java | 8 +-
.../amazon/ec2/BlockDeviceMappingItemType.java | 8 +-
.../BlockDeviceMappingItemTypeChoice_type0.java | 8 +-
.../com/amazon/ec2/BlockDeviceMappingType.java | 8 +-
awsapi/src/com/amazon/ec2/BundleInstance.java | 11 +-
.../com/amazon/ec2/BundleInstanceResponse.java | 11 +-
.../amazon/ec2/BundleInstanceResponseType.java | 8 +-
.../amazon/ec2/BundleInstanceS3StorageType.java | 11 +-
.../amazon/ec2/BundleInstanceTaskErrorType.java | 8 +-
.../ec2/BundleInstanceTaskStorageType.java | 8 +-
.../com/amazon/ec2/BundleInstanceTaskType.java | 8 +-
.../amazon/ec2/BundleInstanceTasksSetType.java | 8 +-
.../src/com/amazon/ec2/BundleInstanceType.java | 8 +-
awsapi/src/com/amazon/ec2/CancelBundleTask.java | 11 +-
.../amazon/ec2/CancelBundleTaskResponse.java | 8 +-
.../ec2/CancelBundleTaskResponseType.java | 8 +-
.../com/amazon/ec2/CancelBundleTaskType.java | 8 +-
.../com/amazon/ec2/CancelConversionTask.java | 11 +-
.../ec2/CancelConversionTaskResponse.java | 11 +-
.../ec2/CancelConversionTaskResponseType.java | 8 +-
.../amazon/ec2/CancelConversionTaskType.java | 8 +-
awsapi/src/com/amazon/ec2/CancelExportTask.java | 11 +-
.../amazon/ec2/CancelExportTaskResponse.java | 8 +-
.../ec2/CancelExportTaskResponseType.java | 8 +-
.../com/amazon/ec2/CancelExportTaskType.java | 8 +-
.../ec2/CancelReservedInstancesListing.java | 11 +-
.../CancelReservedInstancesListingResponse.java | 12 +-
...celReservedInstancesListingResponseType.java | 14 +-
.../ec2/CancelReservedInstancesListingType.java | 11 +-
.../amazon/ec2/CancelSpotInstanceRequests.java | 11 +-
.../ec2/CancelSpotInstanceRequestsResponse.java | 11 +-
...SpotInstanceRequestsResponseSetItemType.java | 11 +-
...ncelSpotInstanceRequestsResponseSetType.java | 11 +-
.../CancelSpotInstanceRequestsResponseType.java | 11 +-
.../ec2/CancelSpotInstanceRequestsType.java | 11 +-
.../com/amazon/ec2/ConfirmProductInstance.java | 11 +-
.../ec2/ConfirmProductInstanceResponse.java | 11 +-
.../ec2/ConfirmProductInstanceResponseType.java | 8 +-
.../amazon/ec2/ConfirmProductInstanceType.java | 8 +-
.../amazon/ec2/ConversionTaskIdItemType.java | 8 +-
.../com/amazon/ec2/ConversionTaskIdSetType.java | 8 +-
.../com/amazon/ec2/ConversionTaskSetType.java | 12 +-
.../src/com/amazon/ec2/ConversionTaskType.java | 8 +-
.../ec2/ConversionTaskTypeChoice_type0.java | 8 +-
.../com/amazon/ec2/CreateCustomerGateway.java | 11 +-
.../ec2/CreateCustomerGatewayResponse.java | 11 +-
.../ec2/CreateCustomerGatewayResponseType.java | 8 +-
.../amazon/ec2/CreateCustomerGatewayType.java | 8 +-
.../src/com/amazon/ec2/CreateDhcpOptions.java | 11 +-
.../amazon/ec2/CreateDhcpOptionsResponse.java | 11 +-
.../ec2/CreateDhcpOptionsResponseType.java | 8 +-
.../com/amazon/ec2/CreateDhcpOptionsType.java | 8 +-
awsapi/src/com/amazon/ec2/CreateImage.java | 8 +-
.../src/com/amazon/ec2/CreateImageResponse.java | 11 +-
.../com/amazon/ec2/CreateImageResponseType.java | 8 +-
awsapi/src/com/amazon/ec2/CreateImageType.java | 8 +-
.../amazon/ec2/CreateInstanceExportTask.java | 8 +-
.../ec2/CreateInstanceExportTaskResponse.java | 11 +-
.../CreateInstanceExportTaskResponseType.java | 8 +-
.../ec2/CreateInstanceExportTaskType.java | 8 +-
...reateInstanceExportTaskTypeChoice_type0.java | 8 +-
.../com/amazon/ec2/CreateInternetGateway.java | 11 +-
.../ec2/CreateInternetGatewayResponse.java | 11 +-
.../ec2/CreateInternetGatewayResponseType.java | 8 +-
.../amazon/ec2/CreateInternetGatewayType.java | 8 +-
awsapi/src/com/amazon/ec2/CreateKeyPair.java | 11 +-
.../com/amazon/ec2/CreateKeyPairResponse.java | 11 +-
.../amazon/ec2/CreateKeyPairResponseType.java | 8 +-
.../src/com/amazon/ec2/CreateKeyPairType.java | 8 +-
awsapi/src/com/amazon/ec2/CreateNetworkAcl.java | 11 +-
.../com/amazon/ec2/CreateNetworkAclEntry.java | 11 +-
.../ec2/CreateNetworkAclEntryResponse.java | 11 +-
.../ec2/CreateNetworkAclEntryResponseType.java | 8 +-
.../amazon/ec2/CreateNetworkAclEntryType.java | 8 +-
.../amazon/ec2/CreateNetworkAclResponse.java | 8 +-
.../ec2/CreateNetworkAclResponseType.java | 8 +-
.../com/amazon/ec2/CreateNetworkAclType.java | 8 +-
.../com/amazon/ec2/CreateNetworkInterface.java | 11 +-
.../ec2/CreateNetworkInterfaceResponse.java | 11 +-
.../ec2/CreateNetworkInterfaceResponseType.java | 8 +-
.../amazon/ec2/CreateNetworkInterfaceType.java | 14 +-
.../com/amazon/ec2/CreatePlacementGroup.java | 11 +-
.../ec2/CreatePlacementGroupResponse.java | 11 +-
.../ec2/CreatePlacementGroupResponseType.java | 8 +-
.../amazon/ec2/CreatePlacementGroupType.java | 8 +-
.../ec2/CreateReservedInstancesListing.java | 11 +-
.../CreateReservedInstancesListingResponse.java | 12 +-
...ateReservedInstancesListingResponseType.java | 14 +-
.../ec2/CreateReservedInstancesListingType.java | 8 +-
awsapi/src/com/amazon/ec2/CreateRoute.java | 8 +-
.../src/com/amazon/ec2/CreateRouteResponse.java | 11 +-
.../com/amazon/ec2/CreateRouteResponseType.java | 8 +-
awsapi/src/com/amazon/ec2/CreateRouteTable.java | 11 +-
.../amazon/ec2/CreateRouteTableResponse.java | 8 +-
.../ec2/CreateRouteTableResponseType.java | 8 +-
.../com/amazon/ec2/CreateRouteTableType.java | 8 +-
awsapi/src/com/amazon/ec2/CreateRouteType.java | 8 +-
.../amazon/ec2/CreateRouteTypeChoice_type0.java | 8 +-
.../src/com/amazon/ec2/CreateSecurityGroup.java | 11 +-
.../amazon/ec2/CreateSecurityGroupResponse.java | 11 +-
.../ec2/CreateSecurityGroupResponseType.java | 8 +-
.../com/amazon/ec2/CreateSecurityGroupType.java | 8 +-
awsapi/src/com/amazon/ec2/CreateSnapshot.java | 11 +-
.../com/amazon/ec2/CreateSnapshotResponse.java | 11 +-
.../amazon/ec2/CreateSnapshotResponseType.java | 8 +-
.../src/com/amazon/ec2/CreateSnapshotType.java | 8 +-
.../ec2/CreateSpotDatafeedSubscription.java | 11 +-
.../CreateSpotDatafeedSubscriptionResponse.java | 12 +-
...ateSpotDatafeedSubscriptionResponseType.java | 11 +-
.../ec2/CreateSpotDatafeedSubscriptionType.java | 8 +-
awsapi/src/com/amazon/ec2/CreateSubnet.java | 8 +-
.../com/amazon/ec2/CreateSubnetResponse.java | 11 +-
.../amazon/ec2/CreateSubnetResponseType.java | 8 +-
awsapi/src/com/amazon/ec2/CreateSubnetType.java | 8 +-
awsapi/src/com/amazon/ec2/CreateTags.java | 8 +-
.../src/com/amazon/ec2/CreateTagsResponse.java | 11 +-
.../com/amazon/ec2/CreateTagsResponseType.java | 8 +-
awsapi/src/com/amazon/ec2/CreateTagsType.java | 8 +-
awsapi/src/com/amazon/ec2/CreateVolume.java | 8 +-
.../ec2/CreateVolumePermissionItemType.java | 8 +-
.../ec2/CreateVolumePermissionListType.java | 8 +-
.../CreateVolumePermissionOperationType.java | 8 +-
.../com/amazon/ec2/CreateVolumeResponse.java | 11 +-
.../amazon/ec2/CreateVolumeResponseType.java | 8 +-
awsapi/src/com/amazon/ec2/CreateVolumeType.java | 8 +-
awsapi/src/com/amazon/ec2/CreateVpc.java | 8 +-
.../src/com/amazon/ec2/CreateVpcResponse.java | 11 +-
.../com/amazon/ec2/CreateVpcResponseType.java | 8 +-
awsapi/src/com/amazon/ec2/CreateVpcType.java | 8 +-
.../src/com/amazon/ec2/CreateVpnConnection.java | 11 +-
.../amazon/ec2/CreateVpnConnectionResponse.java | 11 +-
.../ec2/CreateVpnConnectionResponseType.java | 8 +-
.../amazon/ec2/CreateVpnConnectionRoute.java | 8 +-
.../ec2/CreateVpnConnectionRouteResponse.java | 11 +-
.../CreateVpnConnectionRouteResponseType.java | 8 +-
.../ec2/CreateVpnConnectionRouteType.java | 8 +-
.../com/amazon/ec2/CreateVpnConnectionType.java | 8 +-
awsapi/src/com/amazon/ec2/CreateVpnGateway.java | 11 +-
.../amazon/ec2/CreateVpnGatewayResponse.java | 8 +-
.../ec2/CreateVpnGatewayResponseType.java | 8 +-
.../com/amazon/ec2/CreateVpnGatewayType.java | 8 +-
.../ec2/CustomerGatewayIdSetItemType.java | 8 +-
.../amazon/ec2/CustomerGatewayIdSetType.java | 8 +-
.../com/amazon/ec2/CustomerGatewaySetType.java | 12 +-
.../src/com/amazon/ec2/CustomerGatewayType.java | 8 +-
.../src/com/amazon/ec2/DeactivateLicense.java | 11 +-
.../amazon/ec2/DeactivateLicenseResponse.java | 11 +-
.../ec2/DeactivateLicenseResponseType.java | 8 +-
.../com/amazon/ec2/DeactivateLicenseType.java | 8 +-
.../com/amazon/ec2/DeleteCustomerGateway.java | 11 +-
.../ec2/DeleteCustomerGatewayResponse.java | 11 +-
.../ec2/DeleteCustomerGatewayResponseType.java | 8 +-
.../amazon/ec2/DeleteCustomerGatewayType.java | 8 +-
.../src/com/amazon/ec2/DeleteDhcpOptions.java | 11 +-
.../amazon/ec2/DeleteDhcpOptionsResponse.java | 11 +-
.../ec2/DeleteDhcpOptionsResponseType.java | 8 +-
.../com/amazon/ec2/DeleteDhcpOptionsType.java | 8 +-
.../com/amazon/ec2/DeleteInternetGateway.java | 11 +-
.../ec2/DeleteInternetGatewayResponse.java | 11 +-
.../ec2/DeleteInternetGatewayResponseType.java | 8 +-
.../amazon/ec2/DeleteInternetGatewayType.java | 8 +-
awsapi/src/com/amazon/ec2/DeleteKeyPair.java | 11 +-
.../com/amazon/ec2/DeleteKeyPairResponse.java | 11 +-
.../amazon/ec2/DeleteKeyPairResponseType.java | 8 +-
.../src/com/amazon/ec2/DeleteKeyPairType.java | 8 +-
awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java | 11 +-
.../com/amazon/ec2/DeleteNetworkAclEntry.java | 11 +-
.../ec2/DeleteNetworkAclEntryResponse.java | 11 +-
.../ec2/DeleteNetworkAclEntryResponseType.java | 8 +-
.../amazon/ec2/DeleteNetworkAclEntryType.java | 8 +-
.../amazon/ec2/DeleteNetworkAclResponse.java | 8 +-
.../ec2/DeleteNetworkAclResponseType.java | 8 +-
.../com/amazon/ec2/DeleteNetworkAclType.java | 8 +-
.../com/amazon/ec2/DeleteNetworkInterface.java | 11 +-
.../ec2/DeleteNetworkInterfaceResponse.java | 11 +-
.../ec2/DeleteNetworkInterfaceResponseType.java | 8 +-
.../amazon/ec2/DeleteNetworkInterfaceType.java | 8 +-
.../com/amazon/ec2/DeletePlacementGroup.java | 11 +-
.../ec2/DeletePlacementGroupResponse.java | 11 +-
.../ec2/DeletePlacementGroupResponseType.java | 8 +-
.../amazon/ec2/DeletePlacementGroupType.java | 8 +-
awsapi/src/com/amazon/ec2/DeleteRoute.java | 8 +-
.../src/com/amazon/ec2/DeleteRouteResponse.java | 11 +-
.../com/amazon/ec2/DeleteRouteResponseType.java | 8 +-
awsapi/src/com/amazon/ec2/DeleteRouteTable.java | 11 +-
.../amazon/ec2/DeleteRouteTableResponse.java | 8 +-
.../ec2/DeleteRouteTableResponseType.java | 8 +-
.../com/amazon/ec2/DeleteRouteTableType.java | 8 +-
awsapi/src/com/amazon/ec2/DeleteRouteType.java | 8 +-
.../src/com/amazon/ec2/DeleteSecurityGroup.java | 11 +-
.../amazon/ec2/DeleteSecurityGroupResponse.java | 11 +-
.../ec2/DeleteSecurityGroupResponseType.java | 8 +-
.../com/amazon/ec2/DeleteSecurityGroupType.java | 8 +-
awsapi/src/com/amazon/ec2/DeleteSnapshot.java | 11 +-
.../com/amazon/ec2/DeleteSnapshotResponse.java | 11 +-
.../amazon/ec2/DeleteSnapshotResponseType.java | 8 +-
.../src/com/amazon/ec2/DeleteSnapshotType.java | 8 +-
.../ec2/DeleteSpotDatafeedSubscription.java | 11 +-
.../DeleteSpotDatafeedSubscriptionResponse.java | 12 +-
...eteSpotDatafeedSubscriptionResponseType.java | 8 +-
.../ec2/DeleteSpotDatafeedSubscriptionType.java | 8 +-
awsapi/src/com/amazon/ec2/DeleteSubnet.java | 8 +-
.../com/amazon/ec2/DeleteSubnetResponse.java | 11 +-
.../amazon/ec2/DeleteSubnetResponseType.java | 8 +-
awsapi/src/com/amazon/ec2/DeleteSubnetType.java | 8 +-
awsapi/src/com/amazon/ec2/DeleteTags.java | 8 +-
.../src/com/amazon/ec2/DeleteTagsResponse.java | 11 +-
.../com/amazon/ec2/DeleteTagsResponseType.java | 8 +-
.../com/amazon/ec2/DeleteTagsSetItemType.java | 8 +-
.../src/com/amazon/ec2/DeleteTagsSetType.java | 8 +-
awsapi/src/com/amazon/ec2/DeleteTagsType.java | 8 +-
awsapi/src/com/amazon/ec2/DeleteVolume.java | 8 +-
.../com/amazon/ec2/DeleteVolumeResponse.java | 11 +-
.../amazon/ec2/DeleteVolumeResponseType.java | 8 +-
awsapi/src/com/amazon/ec2/DeleteVolumeType.java | 8 +-
awsapi/src/com/amazon/ec2/DeleteVpc.java | 8 +-
.../src/com/amazon/ec2/DeleteVpcResponse.java | 11 +-
.../com/amazon/ec2/DeleteVpcResponseType.java | 8 +-
awsapi/src/com/amazon/ec2/DeleteVpcType.java | 8 +-
.../src/com/amazon/ec2/DeleteVpnConnection.java | 11 +-
.../amazon/ec2/DeleteVpnConnectionResponse.java | 11 +-
.../ec2/DeleteVpnConnectionResponseType.java | 8 +-
.../amazon/ec2/DeleteVpnConnectionRoute.java | 8 +-
.../ec2/DeleteVpnConnectionRouteResponse.java | 11 +-
.../DeleteVpnConnectionRouteResponseType.java | 8 +-
.../ec2/DeleteVpnConnectionRouteType.java | 8 +-
.../com/amazon/ec2/DeleteVpnConnectionType.java | 8 +-
awsapi/src/com/amazon/ec2/DeleteVpnGateway.java | 11 +-
.../amazon/ec2/DeleteVpnGatewayResponse.java | 8 +-
.../ec2/DeleteVpnGatewayResponseType.java | 8 +-
.../com/amazon/ec2/DeleteVpnGatewayType.java | 8 +-
awsapi/src/com/amazon/ec2/DeregisterImage.java | 11 +-
.../com/amazon/ec2/DeregisterImageResponse.java | 8 +-
.../amazon/ec2/DeregisterImageResponseType.java | 8 +-
.../src/com/amazon/ec2/DeregisterImageType.java | 8 +-
.../src/com/amazon/ec2/DescribeAddresses.java | 11 +-
.../amazon/ec2/DescribeAddressesInfoType.java | 8 +-
.../amazon/ec2/DescribeAddressesItemType.java | 8 +-
.../amazon/ec2/DescribeAddressesResponse.java | 11 +-
.../ec2/DescribeAddressesResponseInfoType.java | 8 +-
.../ec2/DescribeAddressesResponseItemType.java | 11 +-
.../ec2/DescribeAddressesResponseType.java | 8 +-
.../com/amazon/ec2/DescribeAddressesType.java | 8 +-
.../amazon/ec2/DescribeAvailabilityZones.java | 11 +-
.../ec2/DescribeAvailabilityZonesResponse.java | 11 +-
.../DescribeAvailabilityZonesResponseType.java | 8 +-
.../DescribeAvailabilityZonesSetItemType.java | 8 +-
.../ec2/DescribeAvailabilityZonesSetType.java | 8 +-
.../ec2/DescribeAvailabilityZonesType.java | 8 +-
.../src/com/amazon/ec2/DescribeBundleTasks.java | 11 +-
.../amazon/ec2/DescribeBundleTasksInfoType.java | 8 +-
.../amazon/ec2/DescribeBundleTasksItemType.java | 8 +-
.../amazon/ec2/DescribeBundleTasksResponse.java | 11 +-
.../ec2/DescribeBundleTasksResponseType.java | 11 +-
.../com/amazon/ec2/DescribeBundleTasksType.java | 8 +-
.../com/amazon/ec2/DescribeConversionTasks.java | 8 +-
.../ec2/DescribeConversionTasksResponse.java | 11 +-
.../DescribeConversionTasksResponseType.java | 8 +-
.../amazon/ec2/DescribeConversionTasksType.java | 8 +-
.../amazon/ec2/DescribeCustomerGateways.java | 8 +-
.../ec2/DescribeCustomerGatewaysResponse.java | 11 +-
.../DescribeCustomerGatewaysResponseType.java | 8 +-
.../ec2/DescribeCustomerGatewaysType.java | 8 +-
.../src/com/amazon/ec2/DescribeDhcpOptions.java | 11 +-
.../amazon/ec2/DescribeDhcpOptionsResponse.java | 11 +-
.../ec2/DescribeDhcpOptionsResponseType.java | 8 +-
.../com/amazon/ec2/DescribeDhcpOptionsType.java | 8 +-
.../src/com/amazon/ec2/DescribeExportTasks.java | 11 +-
.../amazon/ec2/DescribeExportTasksResponse.java | 11 +-
.../ec2/DescribeExportTasksResponseType.java | 8 +-
.../com/amazon/ec2/DescribeExportTasksType.java | 8 +-
.../com/amazon/ec2/DescribeImageAttribute.java | 11 +-
.../ec2/DescribeImageAttributeResponse.java | 11 +-
.../ec2/DescribeImageAttributeResponseType.java | 8 +-
...eImageAttributeResponseTypeChoice_type0.java | 8 +-
.../amazon/ec2/DescribeImageAttributeType.java | 8 +-
.../ec2/DescribeImageAttributesGroup.java | 8 +-
awsapi/src/com/amazon/ec2/DescribeImages.java | 11 +-
.../ec2/DescribeImagesExecutableBySetType.java | 8 +-
.../ec2/DescribeImagesExecutableByType.java | 8 +-
.../com/amazon/ec2/DescribeImagesInfoType.java | 8 +-
.../com/amazon/ec2/DescribeImagesItemType.java | 8 +-
.../com/amazon/ec2/DescribeImagesOwnerType.java | 8 +-
.../amazon/ec2/DescribeImagesOwnersType.java | 8 +-
.../com/amazon/ec2/DescribeImagesResponse.java | 11 +-
.../ec2/DescribeImagesResponseInfoType.java | 8 +-
.../ec2/DescribeImagesResponseItemType.java | 8 +-
.../amazon/ec2/DescribeImagesResponseType.java | 8 +-
.../src/com/amazon/ec2/DescribeImagesType.java | 8 +-
.../amazon/ec2/DescribeInstanceAttribute.java | 11 +-
.../ec2/DescribeInstanceAttributeResponse.java | 11 +-
.../DescribeInstanceAttributeResponseType.java | 8 +-
...stanceAttributeResponseTypeChoice_type0.java | 18 +-
.../ec2/DescribeInstanceAttributeType.java | 8 +-
.../ec2/DescribeInstanceAttributesGroup.java | 15 +-
.../com/amazon/ec2/DescribeInstanceStatus.java | 11 +-
.../ec2/DescribeInstanceStatusResponse.java | 11 +-
.../ec2/DescribeInstanceStatusResponseType.java | 8 +-
.../amazon/ec2/DescribeInstanceStatusType.java | 8 +-
.../src/com/amazon/ec2/DescribeInstances.java | 11 +-
.../amazon/ec2/DescribeInstancesInfoType.java | 8 +-
.../amazon/ec2/DescribeInstancesItemType.java | 8 +-
.../amazon/ec2/DescribeInstancesResponse.java | 11 +-
.../ec2/DescribeInstancesResponseType.java | 8 +-
.../com/amazon/ec2/DescribeInstancesType.java | 8 +-
.../amazon/ec2/DescribeInternetGateways.java | 8 +-
.../ec2/DescribeInternetGatewaysResponse.java | 11 +-
.../DescribeInternetGatewaysResponseType.java | 8 +-
.../ec2/DescribeInternetGatewaysType.java | 8 +-
awsapi/src/com/amazon/ec2/DescribeKeyPairs.java | 11 +-
.../amazon/ec2/DescribeKeyPairsInfoType.java | 8 +-
.../amazon/ec2/DescribeKeyPairsItemType.java | 8 +-
.../amazon/ec2/DescribeKeyPairsResponse.java | 8 +-
.../ec2/DescribeKeyPairsResponseInfoType.java | 8 +-
.../ec2/DescribeKeyPairsResponseItemType.java | 8 +-
.../ec2/DescribeKeyPairsResponseType.java | 8 +-
.../com/amazon/ec2/DescribeKeyPairsType.java | 8 +-
awsapi/src/com/amazon/ec2/DescribeLicenses.java | 11 +-
.../amazon/ec2/DescribeLicensesResponse.java | 8 +-
.../ec2/DescribeLicensesResponseType.java | 8 +-
.../com/amazon/ec2/DescribeLicensesType.java | 8 +-
.../src/com/amazon/ec2/DescribeNetworkAcls.java | 11 +-
.../amazon/ec2/DescribeNetworkAclsResponse.java | 11 +-
.../ec2/DescribeNetworkAclsResponseType.java | 8 +-
.../com/amazon/ec2/DescribeNetworkAclsType.java | 8 +-
.../ec2/DescribeNetworkInterfaceAttribute.java | 11 +-
...scribeNetworkInterfaceAttributeResponse.java | 12 +-
...beNetworkInterfaceAttributeResponseType.java | 8 +-
...erfaceAttributeResponseTypeChoice_type0.java | 12 +-
.../DescribeNetworkInterfaceAttributeType.java | 8 +-
...DescribeNetworkInterfaceAttributesGroup.java | 8 +-
.../amazon/ec2/DescribeNetworkInterfaces.java | 11 +-
.../ec2/DescribeNetworkInterfacesResponse.java | 11 +-
.../DescribeNetworkInterfacesResponseType.java | 8 +-
.../ec2/DescribeNetworkInterfacesType.java | 11 +-
.../ec2/DescribePlacementGroupItemType.java | 8 +-
.../com/amazon/ec2/DescribePlacementGroups.java | 8 +-
.../ec2/DescribePlacementGroupsInfoType.java | 8 +-
.../ec2/DescribePlacementGroupsResponse.java | 11 +-
.../DescribePlacementGroupsResponseType.java | 8 +-
.../amazon/ec2/DescribePlacementGroupsType.java | 8 +-
awsapi/src/com/amazon/ec2/DescribeRegions.java | 11 +-
.../com/amazon/ec2/DescribeRegionsResponse.java | 8 +-
.../amazon/ec2/DescribeRegionsResponseType.java | 8 +-
.../amazon/ec2/DescribeRegionsSetItemType.java | 8 +-
.../com/amazon/ec2/DescribeRegionsSetType.java | 8 +-
.../src/com/amazon/ec2/DescribeRegionsType.java | 8 +-
.../amazon/ec2/DescribeReservedInstances.java | 11 +-
...ribeReservedInstancesListingSetItemType.java | 11 +-
...DescribeReservedInstancesListingSetType.java | 11 +-
.../ec2/DescribeReservedInstancesListings.java | 11 +-
...scribeReservedInstancesListingsResponse.java | 12 +-
...vedInstancesListingsResponseSetItemType.java | 14 +-
...eservedInstancesListingsResponseSetType.java | 14 +-
...beReservedInstancesListingsResponseType.java | 14 +-
.../DescribeReservedInstancesListingsType.java | 14 +-
.../ec2/DescribeReservedInstancesOfferings.java | 11 +-
...cribeReservedInstancesOfferingsResponse.java | 8 +-
...edInstancesOfferingsResponseSetItemType.java | 14 +-
...servedInstancesOfferingsResponseSetType.java | 14 +-
...eReservedInstancesOfferingsResponseType.java | 14 +-
...beReservedInstancesOfferingsSetItemType.java | 11 +-
...scribeReservedInstancesOfferingsSetType.java | 11 +-
.../DescribeReservedInstancesOfferingsType.java | 15 +-
.../ec2/DescribeReservedInstancesResponse.java | 11 +-
...ibeReservedInstancesResponseSetItemType.java | 8 +-
...escribeReservedInstancesResponseSetType.java | 11 +-
.../DescribeReservedInstancesResponseType.java | 8 +-
.../DescribeReservedInstancesSetItemType.java | 8 +-
.../ec2/DescribeReservedInstancesSetType.java | 8 +-
.../ec2/DescribeReservedInstancesType.java | 8 +-
.../src/com/amazon/ec2/DescribeRouteTables.java | 11 +-
.../amazon/ec2/DescribeRouteTablesResponse.java | 11 +-
.../ec2/DescribeRouteTablesResponseType.java | 8 +-
.../com/amazon/ec2/DescribeRouteTablesType.java | 8 +-
.../com/amazon/ec2/DescribeSecurityGroups.java | 11 +-
.../DescribeSecurityGroupsIdSetItemType.java | 8 +-
.../ec2/DescribeSecurityGroupsIdSetType.java | 8 +-
.../ec2/DescribeSecurityGroupsResponse.java | 11 +-
.../ec2/DescribeSecurityGroupsResponseType.java | 8 +-
.../ec2/DescribeSecurityGroupsSetItemType.java | 8 +-
.../ec2/DescribeSecurityGroupsSetType.java | 8 +-
.../amazon/ec2/DescribeSecurityGroupsType.java | 8 +-
.../amazon/ec2/DescribeSnapshotAttribute.java | 11 +-
.../ec2/DescribeSnapshotAttributeResponse.java | 11 +-
.../DescribeSnapshotAttributeResponseType.java | 8 +-
...apshotAttributeResponseTypeChoice_type0.java | 14 +-
.../ec2/DescribeSnapshotAttributeType.java | 8 +-
.../ec2/DescribeSnapshotAttributesGroup.java | 11 +-
.../src/com/amazon/ec2/DescribeSnapshots.java | 11 +-
.../amazon/ec2/DescribeSnapshotsOwnerType.java | 8 +-
.../amazon/ec2/DescribeSnapshotsOwnersType.java | 8 +-
.../amazon/ec2/DescribeSnapshotsResponse.java | 11 +-
.../ec2/DescribeSnapshotsResponseType.java | 8 +-
.../DescribeSnapshotsRestorableBySetType.java | 8 +-
.../ec2/DescribeSnapshotsRestorableByType.java | 8 +-
.../DescribeSnapshotsSetItemResponseType.java | 8 +-
.../ec2/DescribeSnapshotsSetItemType.java | 8 +-
.../ec2/DescribeSnapshotsSetResponseType.java | 8 +-
.../amazon/ec2/DescribeSnapshotsSetType.java | 8 +-
.../com/amazon/ec2/DescribeSnapshotsType.java | 8 +-
.../ec2/DescribeSpotDatafeedSubscription.java | 11 +-
...escribeSpotDatafeedSubscriptionResponse.java | 12 +-
...ibeSpotDatafeedSubscriptionResponseType.java | 11 +-
.../DescribeSpotDatafeedSubscriptionType.java | 8 +-
.../ec2/DescribeSpotInstanceRequests.java | 11 +-
.../DescribeSpotInstanceRequestsResponse.java | 12 +-
...escribeSpotInstanceRequestsResponseType.java | 11 +-
.../ec2/DescribeSpotInstanceRequestsType.java | 11 +-
.../amazon/ec2/DescribeSpotPriceHistory.java | 8 +-
.../ec2/DescribeSpotPriceHistoryResponse.java | 11 +-
.../DescribeSpotPriceHistoryResponseType.java | 8 +-
.../ec2/DescribeSpotPriceHistoryType.java | 11 +-
awsapi/src/com/amazon/ec2/DescribeSubnets.java | 11 +-
.../com/amazon/ec2/DescribeSubnetsResponse.java | 8 +-
.../amazon/ec2/DescribeSubnetsResponseType.java | 8 +-
.../src/com/amazon/ec2/DescribeSubnetsType.java | 8 +-
awsapi/src/com/amazon/ec2/DescribeTags.java | 8 +-
.../com/amazon/ec2/DescribeTagsResponse.java | 11 +-
.../amazon/ec2/DescribeTagsResponseType.java | 8 +-
awsapi/src/com/amazon/ec2/DescribeTagsType.java | 8 +-
.../com/amazon/ec2/DescribeVolumeAttribute.java | 8 +-
.../ec2/DescribeVolumeAttributeResponse.java | 11 +-
.../DescribeVolumeAttributeResponseType.java | 8 +-
...VolumeAttributeResponseTypeChoice_type0.java | 11 +-
.../amazon/ec2/DescribeVolumeAttributeType.java | 8 +-
.../ec2/DescribeVolumeAttributesGroup.java | 8 +-
.../com/amazon/ec2/DescribeVolumeStatus.java | 11 +-
.../ec2/DescribeVolumeStatusResponse.java | 11 +-
.../ec2/DescribeVolumeStatusResponseType.java | 8 +-
.../amazon/ec2/DescribeVolumeStatusType.java | 8 +-
awsapi/src/com/amazon/ec2/DescribeVolumes.java | 11 +-
.../com/amazon/ec2/DescribeVolumesResponse.java | 8 +-
.../amazon/ec2/DescribeVolumesResponseType.java | 8 +-
.../ec2/DescribeVolumesSetItemResponseType.java | 8 +-
.../amazon/ec2/DescribeVolumesSetItemType.java | 8 +-
.../ec2/DescribeVolumesSetResponseType.java | 8 +-
.../com/amazon/ec2/DescribeVolumesSetType.java | 8 +-
.../src/com/amazon/ec2/DescribeVolumesType.java | 8 +-
awsapi/src/com/amazon/ec2/DescribeVpcs.java | 8 +-
.../com/amazon/ec2/DescribeVpcsResponse.java | 11 +-
.../amazon/ec2/DescribeVpcsResponseType.java | 8 +-
awsapi/src/com/amazon/ec2/DescribeVpcsType.java | 8 +-
.../com/amazon/ec2/DescribeVpnConnections.java | 11 +-
.../ec2/DescribeVpnConnectionsResponse.java | 11 +-
.../ec2/DescribeVpnConnectionsResponseType.java | 8 +-
.../amazon/ec2/DescribeVpnConnectionsType.java | 8 +-
.../src/com/amazon/ec2/DescribeVpnGateways.java | 11 +-
.../amazon/ec2/DescribeVpnGatewaysResponse.java | 11 +-
.../ec2/DescribeVpnGatewaysResponseType.java | 8 +-
.../com/amazon/ec2/DescribeVpnGatewaysType.java | 8 +-
.../com/amazon/ec2/DetachInternetGateway.java | 11 +-
.../ec2/DetachInternetGatewayResponse.java | 11 +-
.../ec2/DetachInternetGatewayResponseType.java | 8 +-
.../amazon/ec2/DetachInternetGatewayType.java | 8 +-
.../com/amazon/ec2/DetachNetworkInterface.java | 11 +-
.../ec2/DetachNetworkInterfaceResponse.java | 11 +-
.../ec2/DetachNetworkInterfaceResponseType.java | 8 +-
.../amazon/ec2/DetachNetworkInterfaceType.java | 8 +-
awsapi/src/com/amazon/ec2/DetachVolume.java | 8 +-
.../com/amazon/ec2/DetachVolumeResponse.java | 11 +-
.../amazon/ec2/DetachVolumeResponseType.java | 8 +-
awsapi/src/com/amazon/ec2/DetachVolumeType.java | 8 +-
awsapi/src/com/amazon/ec2/DetachVpnGateway.java | 11 +-
.../amazon/ec2/DetachVpnGatewayResponse.java | 8 +-
.../ec2/DetachVpnGatewayResponseType.java | 8 +-
.../com/amazon/ec2/DetachVpnGatewayType.java | 8 +-
.../ec2/DhcpConfigurationItemSetType.java | 8 +-
.../amazon/ec2/DhcpConfigurationItemType.java | 8 +-
.../amazon/ec2/DhcpOptionsIdSetItemType.java | 8 +-
.../com/amazon/ec2/DhcpOptionsIdSetType.java | 8 +-
.../src/com/amazon/ec2/DhcpOptionsSetType.java | 11 +-
awsapi/src/com/amazon/ec2/DhcpOptionsType.java | 8 +-
awsapi/src/com/amazon/ec2/DhcpValueSetType.java | 11 +-
awsapi/src/com/amazon/ec2/DhcpValueType.java | 8 +-
.../amazon/ec2/DisableVgwRoutePropagation.java | 11 +-
.../DisableVgwRoutePropagationRequestType.java | 8 +-
.../ec2/DisableVgwRoutePropagationResponse.java | 11 +-
.../DisableVgwRoutePropagationResponseType.java | 8 +-
.../src/com/amazon/ec2/DisassociateAddress.java | 11 +-
.../amazon/ec2/DisassociateAddressResponse.java | 11 +-
.../ec2/DisassociateAddressResponseType.java | 8 +-
.../com/amazon/ec2/DisassociateAddressType.java | 11 +-
.../com/amazon/ec2/DisassociateRouteTable.java | 11 +-
.../ec2/DisassociateRouteTableResponse.java | 11 +-
.../ec2/DisassociateRouteTableResponseType.java | 8 +-
.../amazon/ec2/DisassociateRouteTableType.java | 8 +-
.../amazon/ec2/DiskImageDescriptionType.java | 8 +-
.../src/com/amazon/ec2/DiskImageDetailType.java | 8 +-
awsapi/src/com/amazon/ec2/DiskImageSetType.java | 11 +-
awsapi/src/com/amazon/ec2/DiskImageType.java | 8 +-
.../ec2/DiskImageVolumeDescriptionType.java | 8 +-
.../src/com/amazon/ec2/DiskImageVolumeType.java | 8 +-
.../src/com/amazon/ec2/EbsBlockDeviceType.java | 8 +-
...sInstanceBlockDeviceMappingResponseType.java | 8 +-
awsapi/src/com/amazon/ec2/EmptyElementType.java | 8 +-
.../amazon/ec2/EnableVgwRoutePropagation.java | 11 +-
.../EnableVgwRoutePropagationRequestType.java | 8 +-
.../ec2/EnableVgwRoutePropagationResponse.java | 11 +-
.../EnableVgwRoutePropagationResponseType.java | 8 +-
awsapi/src/com/amazon/ec2/EnableVolumeIO.java | 11 +-
.../com/amazon/ec2/EnableVolumeIOResponse.java | 11 +-
.../amazon/ec2/EnableVolumeIOResponseType.java | 8 +-
.../src/com/amazon/ec2/EnableVolumeIOType.java | 8 +-
.../src/com/amazon/ec2/ExportTaskIdSetType.java | 11 +-
awsapi/src/com/amazon/ec2/ExportTaskIdType.java | 8 +-
.../com/amazon/ec2/ExportTaskResponseType.java | 8 +-
.../ec2/ExportTaskResponseTypeChoice_type0.java | 8 +-
.../ec2/ExportTaskResponseTypeChoice_type1.java | 8 +-
.../amazon/ec2/ExportTaskSetResponseType.java | 8 +-
.../amazon/ec2/ExportToS3TaskResponseType.java | 8 +-
.../src/com/amazon/ec2/ExportToS3TaskType.java | 8 +-
awsapi/src/com/amazon/ec2/ExtensionMapper.java | 3 +-
awsapi/src/com/amazon/ec2/FilterSetType.java | 8 +-
awsapi/src/com/amazon/ec2/FilterType.java | 8 +-
awsapi/src/com/amazon/ec2/GetConsoleOutput.java | 11 +-
.../amazon/ec2/GetConsoleOutputResponse.java | 8 +-
.../ec2/GetConsoleOutputResponseType.java | 8 +-
.../com/amazon/ec2/GetConsoleOutputType.java | 8 +-
awsapi/src/com/amazon/ec2/GetPasswordData.java | 11 +-
.../com/amazon/ec2/GetPasswordDataResponse.java | 8 +-
.../amazon/ec2/GetPasswordDataResponseType.java | 8 +-
.../src/com/amazon/ec2/GetPasswordDataType.java | 8 +-
awsapi/src/com/amazon/ec2/GroupItemType.java | 8 +-
awsapi/src/com/amazon/ec2/GroupSetType.java | 11 +-
.../ec2/IamInstanceProfileRequestType.java | 8 +-
.../ec2/IamInstanceProfileResponseType.java | 8 +-
awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java | 8 +-
awsapi/src/com/amazon/ec2/ImportInstance.java | 11 +-
.../amazon/ec2/ImportInstanceGroupItemType.java | 8 +-
.../amazon/ec2/ImportInstanceGroupSetType.java | 8 +-
.../ImportInstanceLaunchSpecificationType.java | 8 +-
.../com/amazon/ec2/ImportInstanceResponse.java | 11 +-
.../amazon/ec2/ImportInstanceResponseType.java | 8 +-
.../ec2/ImportInstanceTaskDetailsType.java | 8 +-
.../src/com/amazon/ec2/ImportInstanceType.java | 8 +-
.../ec2/ImportInstanceVolumeDetailItemType.java | 8 +-
.../ec2/ImportInstanceVolumeDetailSetType.java | 8 +-
awsapi/src/com/amazon/ec2/ImportKeyPair.java | 11 +-
.../com/amazon/ec2/ImportKeyPairResponse.java | 11 +-
.../amazon/ec2/ImportKeyPairResponseType.java | 8 +-
.../src/com/amazon/ec2/ImportKeyPairType.java | 8 +-
awsapi/src/com/amazon/ec2/ImportVolume.java | 8 +-
.../com/amazon/ec2/ImportVolumeResponse.java | 11 +-
.../amazon/ec2/ImportVolumeResponseType.java | 8 +-
.../amazon/ec2/ImportVolumeTaskDetailsType.java | 8 +-
awsapi/src/com/amazon/ec2/ImportVolumeType.java | 8 +-
.../ec2/InstanceBlockDeviceMappingItemType.java | 8 +-
...eBlockDeviceMappingItemTypeChoice_type0.java | 8 +-
...tanceBlockDeviceMappingResponseItemType.java | 8 +-
...viceMappingResponseItemTypeChoice_type0.java | 11 +-
.../InstanceBlockDeviceMappingResponseType.java | 11 +-
.../ec2/InstanceBlockDeviceMappingType.java | 8 +-
.../amazon/ec2/InstanceCountsSetItemType.java | 8 +-
.../com/amazon/ec2/InstanceCountsSetType.java | 8 +-
.../amazon/ec2/InstanceEbsBlockDeviceType.java | 8 +-
.../ec2/InstanceExportTaskResponseType.java | 8 +-
.../src/com/amazon/ec2/InstanceIdSetType.java | 11 +-
awsapi/src/com/amazon/ec2/InstanceIdType.java | 8 +-
.../amazon/ec2/InstanceLicenseRequestType.java | 8 +-
.../amazon/ec2/InstanceLicenseResponseType.java | 8 +-
.../amazon/ec2/InstanceMonitoringStateType.java | 8 +-
...InstanceNetworkInterfaceAssociationType.java | 8 +-
.../InstanceNetworkInterfaceAttachmentType.java | 8 +-
...tanceNetworkInterfaceSetItemRequestType.java | 14 +-
.../InstanceNetworkInterfaceSetItemType.java | 11 +-
.../InstanceNetworkInterfaceSetRequestType.java | 11 +-
.../ec2/InstanceNetworkInterfaceSetType.java | 8 +-
.../com/amazon/ec2/InstancePlacementType.java | 8 +-
.../InstancePrivateIpAddressesSetItemType.java | 8 +-
.../ec2/InstancePrivateIpAddressesSetType.java | 8 +-
.../amazon/ec2/InstanceStateChangeSetType.java | 8 +-
.../com/amazon/ec2/InstanceStateChangeType.java | 8 +-
.../src/com/amazon/ec2/InstanceStateType.java | 8 +-
.../ec2/InstanceStatusDetailsSetItemType.java | 8 +-
.../ec2/InstanceStatusDetailsSetType.java | 8 +-
.../com/amazon/ec2/InstanceStatusEventType.java | 8 +-
.../amazon/ec2/InstanceStatusEventsSetType.java | 8 +-
.../com/amazon/ec2/InstanceStatusItemType.java | 8 +-
.../com/amazon/ec2/InstanceStatusSetType.java | 8 +-
.../src/com/amazon/ec2/InstanceStatusType.java | 8 +-
.../com/amazon/ec2/InstanceTypeSetItemType.java | 8 +-
.../src/com/amazon/ec2/InstanceTypeSetType.java | 8 +-
.../ec2/InternetGatewayAttachmentSetType.java | 8 +-
.../ec2/InternetGatewayAttachmentType.java | 8 +-
.../ec2/InternetGatewayIdSetItemType.java | 8 +-
.../amazon/ec2/InternetGatewayIdSetType.java | 8 +-
.../com/amazon/ec2/InternetGatewaySetType.java | 12 +-
.../src/com/amazon/ec2/InternetGatewayType.java | 8 +-
.../src/com/amazon/ec2/IpPermissionSetType.java | 11 +-
awsapi/src/com/amazon/ec2/IpPermissionType.java | 8 +-
awsapi/src/com/amazon/ec2/IpRangeItemType.java | 8 +-
awsapi/src/com/amazon/ec2/IpRangeSetType.java | 11 +-
.../amazon/ec2/LaunchPermissionItemType.java | 8 +-
.../amazon/ec2/LaunchPermissionListType.java | 8 +-
.../ec2/LaunchPermissionOperationType.java | 8 +-
.../ec2/LaunchSpecificationRequestType.java | 8 +-
.../ec2/LaunchSpecificationResponseType.java | 8 +-
.../amazon/ec2/LicenseCapacitySetItemType.java | 8 +-
.../com/amazon/ec2/LicenseCapacitySetType.java | 8 +-
.../com/amazon/ec2/LicenseIdSetItemType.java | 8 +-
awsapi/src/com/amazon/ec2/LicenseIdSetType.java | 8 +-
.../src/com/amazon/ec2/LicenseSetItemType.java | 8 +-
awsapi/src/com/amazon/ec2/LicenseSetType.java | 12 +-
.../com/amazon/ec2/ModifyImageAttribute.java | 11 +-
.../ec2/ModifyImageAttributeResponse.java | 11 +-
.../ec2/ModifyImageAttributeResponseType.java | 8 +-
.../amazon/ec2/ModifyImageAttributeType.java | 8 +-
.../ModifyImageAttributeTypeChoice_type0.java | 8 +-
.../com/amazon/ec2/ModifyInstanceAttribute.java | 8 +-
.../ec2/ModifyInstanceAttributeResponse.java | 11 +-
.../ModifyInstanceAttributeResponseType.java | 8 +-
.../amazon/ec2/ModifyInstanceAttributeType.java | 8 +-
...ModifyInstanceAttributeTypeChoice_type0.java | 15 +-
.../ModifyNetworkInterfaceAttachmentType.java | 8 +-
.../ec2/ModifyNetworkInterfaceAttribute.java | 11 +-
...ModifyNetworkInterfaceAttributeResponse.java | 12 +-
...fyNetworkInterfaceAttributeResponseType.java | 8 +-
.../ModifyNetworkInterfaceAttributeType.java | 8 +-
...tworkInterfaceAttributeTypeChoice_type0.java | 11 +-
.../com/amazon/ec2/ModifySnapshotAttribute.java | 8 +-
.../ec2/ModifySnapshotAttributeResponse.java | 11 +-
.../ModifySnapshotAttributeResponseType.java | 8 +-
.../amazon/ec2/ModifySnapshotAttributeType.java | 11 +-
.../com/amazon/ec2/ModifyVolumeAttribute.java | 11 +-
.../ec2/ModifyVolumeAttributeResponse.java | 11 +-
.../ec2/ModifyVolumeAttributeResponseType.java | 8 +-
.../amazon/ec2/ModifyVolumeAttributeType.java | 8 +-
.../ModifyVolumeAttributeTypeChoice_type0.java | 8 +-
awsapi/src/com/amazon/ec2/MonitorInstances.java | 11 +-
.../amazon/ec2/MonitorInstancesResponse.java | 8 +-
.../MonitorInstancesResponseSetItemType.java | 8 +-
.../ec2/MonitorInstancesResponseSetType.java | 8 +-
.../ec2/MonitorInstancesResponseType.java | 8 +-
.../amazon/ec2/MonitorInstancesSetItemType.java | 8 +-
.../com/amazon/ec2/MonitorInstancesSetType.java | 8 +-
.../com/amazon/ec2/MonitorInstancesType.java | 8 +-
.../com/amazon/ec2/MonitoringInstanceType.java | 8 +-
.../ec2/NetworkAclAssociationSetType.java | 8 +-
.../amazon/ec2/NetworkAclAssociationType.java | 11 +-
.../com/amazon/ec2/NetworkAclEntrySetType.java | 12 +-
.../src/com/amazon/ec2/NetworkAclEntryType.java | 8 +-
.../com/amazon/ec2/NetworkAclIdSetItemType.java | 8 +-
.../src/com/amazon/ec2/NetworkAclIdSetType.java | 8 +-
.../src/com/amazon/ec2/NetworkAclSetType.java | 11 +-
awsapi/src/com/amazon/ec2/NetworkAclType.java | 8 +-
.../ec2/NetworkInterfaceAssociationType.java | 8 +-
.../ec2/NetworkInterfaceAttachmentType.java | 8 +-
.../ec2/NetworkInterfaceIdSetItemType.java | 8 +-
.../amazon/ec2/NetworkInterfaceIdSetType.java | 8 +-
...kInterfacePrivateIpAddressesSetItemType.java | 8 +-
...tworkInterfacePrivateIpAddressesSetType.java | 11 +-
.../com/amazon/ec2/NetworkInterfaceSetType.java | 8 +-
.../com/amazon/ec2/NetworkInterfaceType.java | 11 +-
.../ec2/NullableAttributeBooleanValueType.java | 8 +-
.../amazon/ec2/NullableAttributeValueType.java | 8 +-
.../com/amazon/ec2/PlacementGroupInfoType.java | 8 +-
.../com/amazon/ec2/PlacementGroupSetType.java | 8 +-
.../com/amazon/ec2/PlacementRequestType.java | 8 +-
.../com/amazon/ec2/PlacementResponseType.java | 8 +-
awsapi/src/com/amazon/ec2/PortRangeType.java | 8 +-
.../ec2/PriceScheduleRequestSetItemType.java | 8 +-
.../amazon/ec2/PriceScheduleRequestSetType.java | 8 +-
.../amazon/ec2/PriceScheduleSetItemType.java | 8 +-
.../com/amazon/ec2/PriceScheduleSetType.java | 8 +-
.../amazon/ec2/PricingDetailsSetItemType.java | 8 +-
.../com/amazon/ec2/PricingDetailsSetType.java | 8 +-
.../PrivateIpAddressesSetItemRequestType.java | 8 +-
.../ec2/PrivateIpAddressesSetRequestType.java | 8 +-
.../src/com/amazon/ec2/ProductCodeItemType.java | 8 +-
.../src/com/amazon/ec2/ProductCodeListType.java | 12 +-
.../com/amazon/ec2/ProductCodesSetItemType.java | 8 +-
.../src/com/amazon/ec2/ProductCodesSetType.java | 8 +-
.../ec2/ProductDescriptionSetItemType.java | 8 +-
.../amazon/ec2/ProductDescriptionSetType.java | 8 +-
.../com/amazon/ec2/PropagatingVgwSetType.java | 12 +-
.../src/com/amazon/ec2/PropagatingVgwType.java | 8 +-
.../ec2/PurchaseReservedInstancesOffering.java | 11 +-
...rchaseReservedInstancesOfferingResponse.java | 12 +-
...seReservedInstancesOfferingResponseType.java | 8 +-
.../PurchaseReservedInstancesOfferingType.java | 11 +-
awsapi/src/com/amazon/ec2/RebootInstances.java | 11 +-
.../com/amazon/ec2/RebootInstancesInfoType.java | 8 +-
.../com/amazon/ec2/RebootInstancesItemType.java | 8 +-
.../com/amazon/ec2/RebootInstancesResponse.java | 8 +-
.../amazon/ec2/RebootInstancesResponseType.java | 8 +-
.../src/com/amazon/ec2/RebootInstancesType.java | 8 +-
.../amazon/ec2/RecurringChargesSetItemType.java | 8 +-
.../com/amazon/ec2/RecurringChargesSetType.java | 8 +-
awsapi/src/com/amazon/ec2/RegionItemType.java | 8 +-
awsapi/src/com/amazon/ec2/RegionSetType.java | 11 +-
awsapi/src/com/amazon/ec2/RegisterImage.java | 11 +-
.../com/amazon/ec2/RegisterImageResponse.java | 11 +-
.../amazon/ec2/RegisterImageResponseType.java | 8 +-
.../src/com/amazon/ec2/RegisterImageType.java | 8 +-
awsapi/src/com/amazon/ec2/ReleaseAddress.java | 11 +-
.../com/amazon/ec2/ReleaseAddressResponse.java | 11 +-
.../amazon/ec2/ReleaseAddressResponseType.java | 8 +-
.../src/com/amazon/ec2/ReleaseAddressType.java | 8 +-
.../ec2/ReleaseAddressTypeChoice_type0.java | 8 +-
.../ec2/ReplaceNetworkAclAssociation.java | 11 +-
.../ReplaceNetworkAclAssociationResponse.java | 12 +-
...eplaceNetworkAclAssociationResponseType.java | 8 +-
.../ec2/ReplaceNetworkAclAssociationType.java | 8 +-
.../com/amazon/ec2/ReplaceNetworkAclEntry.java | 11 +-
.../ec2/ReplaceNetworkAclEntryResponse.java | 11 +-
.../ec2/ReplaceNetworkAclEntryResponseType.java | 8 +-
.../amazon/ec2/ReplaceNetworkAclEntryType.java | 8 +-
awsapi/src/com/amazon/ec2/ReplaceRoute.java | 8 +-
.../com/amazon/ec2/ReplaceRouteResponse.java | 11 +-
.../amazon/ec2/ReplaceRouteResponseType.java | 8 +-
.../ec2/ReplaceRouteTableAssociation.java | 11 +-
.../ReplaceRouteTableAssociationResponse.java | 12 +-
...eplaceRouteTableAssociationResponseType.java | 8 +-
.../ec2/ReplaceRouteTableAssociationType.java | 8 +-
awsapi/src/com/amazon/ec2/ReplaceRouteType.java | 8 +-
.../ec2/ReplaceRouteTypeChoice_type0.java | 8 +-
.../com/amazon/ec2/ReportInstanceStatus.java | 11 +-
...portInstanceStatusReasonCodeSetItemType.java | 8 +-
.../ReportInstanceStatusReasonCodesSetType.java | 11 +-
.../ec2/ReportInstanceStatusResponse.java | 11 +-
.../ec2/ReportInstanceStatusResponseType.java | 8 +-
.../amazon/ec2/ReportInstanceStatusType.java | 8 +-
.../com/amazon/ec2/RequestSpotInstances.java | 11 +-
.../ec2/RequestSpotInstancesResponse.java | 11 +-
.../ec2/RequestSpotInstancesResponseType.java | 11 +-
.../amazon/ec2/RequestSpotInstancesType.java | 11 +-
.../src/com/amazon/ec2/ReservationInfoType.java | 8 +-
.../src/com/amazon/ec2/ReservationSetType.java | 12 +-
.../ec2/ReservedInstanceLimitPriceType.java | 8 +-
.../src/com/amazon/ec2/ResetImageAttribute.java | 11 +-
.../amazon/ec2/ResetImageAttributeResponse.java | 11 +-
.../ec2/ResetImageAttributeResponseType.java | 8 +-
.../com/amazon/ec2/ResetImageAttributeType.java | 8 +-
.../amazon/ec2/ResetImageAttributesGroup.java | 8 +-
.../com/amazon/ec2/ResetInstanceAttribute.java | 11 +-
.../ec2/ResetInstanceAttributeResponse.java | 11 +-
.../ec2/ResetInstanceAttributeResponseType.java | 8 +-
.../amazon/ec2/ResetInstanceAttributeType.java | 8 +-
.../ec2/ResetInstanceAttributesGroup.java | 8 +-
.../ec2/ResetNetworkInterfaceAttribute.java | 11 +-
.../ResetNetworkInterfaceAttributeResponse.java | 12 +-
...etNetworkInterfaceAttributeResponseType.java | 8 +-
.../ec2/ResetNetworkInterfaceAttributeType.java | 8 +-
.../ResetNetworkInterfaceAttributesGroup.java | 8 +-
.../com/amazon/ec2/ResetSnapshotAttribute.java | 11 +-
.../ec2/ResetSnapshotAttributeResponse.java | 11 +-
.../ec2/ResetSnapshotAttributeResponseType.java | 8 +-
.../amazon/ec2/ResetSnapshotAttributeType.java | 8 +-
.../ec2/ResetSnapshotAttributesGroup.java | 11 +-
.../com/amazon/ec2/ResourceIdSetItemType.java | 8 +-
.../src/com/amazon/ec2/ResourceIdSetType.java | 8 +-
.../com/amazon/ec2/ResourceTagSetItemType.java | 8 +-
.../src/com/amazon/ec2/ResourceTagSetType.java | 8 +-
.../amazon/ec2/RevokeSecurityGroupEgress.java | 11 +-
.../ec2/RevokeSecurityGroupEgressResponse.java | 11 +-
.../RevokeSecurityGroupEgressResponseType.java | 8 +-
.../ec2/RevokeSecurityGroupEgressType.java | 8 +-
.../amazon/ec2/RevokeSecurityGroupIngress.java | 11 +-
.../ec2/RevokeSecurityGroupIngressResponse.java | 11 +-
.../RevokeSecurityGroupIngressResponseType.java | 8 +-
.../ec2/RevokeSecurityGroupIngressType.java | 8 +-
...okeSecurityGroupIngressTypeChoice_type0.java | 8 +-
awsapi/src/com/amazon/ec2/RouteSetType.java | 8 +-
.../ec2/RouteTableAssociationSetType.java | 8 +-
.../amazon/ec2/RouteTableAssociationType.java | 11 +-
.../RouteTableAssociationTypeChoice_type0.java | 8 +-
.../com/amazon/ec2/RouteTableIdSetItemType.java | 8 +-
.../src/com/amazon/ec2/RouteTableIdSetType.java | 8 +-
.../src/com/amazon/ec2/RouteTableSetType.java | 11 +-
awsapi/src/com/amazon/ec2/RouteTableType.java | 8 +-
awsapi/src/com/amazon/ec2/RouteType.java | 8 +-
awsapi/src/com/amazon/ec2/RunInstances.java | 8 +-
.../com/amazon/ec2/RunInstancesResponse.java | 11 +-
.../amazon/ec2/RunInstancesResponseType.java | 8 +-
awsapi/src/com/amazon/ec2/RunInstancesType.java | 11 +-
.../amazon/ec2/RunningInstancesItemType.java | 11 +-
.../com/amazon/ec2/RunningInstancesSetType.java | 8 +-
.../amazon/ec2/SecurityGroupIdSetItemType.java | 8 +-
.../com/amazon/ec2/SecurityGroupIdSetType.java | 8 +-
.../com/amazon/ec2/SecurityGroupItemType.java | 8 +-
.../com/amazon/ec2/SecurityGroupSetType.java | 8 +-
.../ec2/SpotDatafeedSubscriptionType.java | 8 +-
.../ec2/SpotInstanceRequestIdSetItemType.java | 11 +-
.../ec2/SpotInstanceRequestIdSetType.java | 8 +-
.../ec2/SpotInstanceRequestSetItemType.java | 17 +-
.../amazon/ec2/SpotInstanceRequestSetType.java | 8 +-
.../amazon/ec2/SpotInstanceStateFaultType.java | 8 +-
.../amazon/ec2/SpotPlacementRequestType.java | 8 +-
.../amazon/ec2/SpotPriceHistorySetItemType.java | 8 +-
.../com/amazon/ec2/SpotPriceHistorySetType.java | 8 +-
awsapi/src/com/amazon/ec2/StartInstances.java | 11 +-
.../com/amazon/ec2/StartInstancesResponse.java | 11 +-
.../amazon/ec2/StartInstancesResponseType.java | 8 +-
.../src/com/amazon/ec2/StartInstancesType.java | 8 +-
awsapi/src/com/amazon/ec2/StateReasonType.java | 8 +-
awsapi/src/com/amazon/ec2/StopInstances.java | 11 +-
.../com/amazon/ec2/StopInstancesResponse.java | 11 +-
.../amazon/ec2/StopInstancesResponseType.java | 8 +-
.../src/com/amazon/ec2/StopInstancesType.java | 8 +-
.../src/com/amazon/ec2/SubnetIdSetItemType.java | 8 +-
awsapi/src/com/amazon/ec2/SubnetIdSetType.java | 12 +-
awsapi/src/com/amazon/ec2/SubnetSetType.java | 8 +-
awsapi/src/com/amazon/ec2/SubnetType.java | 11 +-
awsapi/src/com/amazon/ec2/TagSetItemType.java | 8 +-
awsapi/src/com/amazon/ec2/TagSetType.java | 11 +-
.../src/com/amazon/ec2/TerminateInstances.java | 11 +-
.../amazon/ec2/TerminateInstancesResponse.java | 11 +-
.../ec2/TerminateInstancesResponseType.java | 8 +-
.../com/amazon/ec2/TerminateInstancesType.java | 8 +-
.../amazon/ec2/UnassignPrivateIpAddresses.java | 11 +-
.../ec2/UnassignPrivateIpAddressesResponse.java | 11 +-
.../UnassignPrivateIpAddressesResponseType.java | 8 +-
.../ec2/UnassignPrivateIpAddressesType.java | 11 +-
.../src/com/amazon/ec2/UnmonitorInstances.java | 11 +-
.../amazon/ec2/UnmonitorInstancesResponse.java | 11 +-
awsapi/src/com/amazon/ec2/UserDataType.java | 12 +-
.../com/amazon/ec2/UserIdGroupPairSetType.java | 12 +-
.../src/com/amazon/ec2/UserIdGroupPairType.java | 8 +-
awsapi/src/com/amazon/ec2/ValueSetType.java | 8 +-
awsapi/src/com/amazon/ec2/ValueType.java | 8 +-
awsapi/src/com/amazon/ec2/VgwTelemetryType.java | 8 +-
.../amazon/ec2/VolumeStatusActionItemType.java | 8 +-
.../amazon/ec2/VolumeStatusActionsSetType.java | 8 +-
.../amazon/ec2/VolumeStatusDetailsItemType.java | 8 +-
.../amazon/ec2/VolumeStatusDetailsSetType.java | 8 +-
.../amazon/ec2/VolumeStatusEventItemType.java | 8 +-
.../amazon/ec2/VolumeStatusEventsSetType.java | 8 +-
.../com/amazon/ec2/VolumeStatusInfoType.java | 8 +-
.../com/amazon/ec2/VolumeStatusItemType.java | 8 +-
.../src/com/amazon/ec2/VolumeStatusSetType.java | 8 +-
awsapi/src/com/amazon/ec2/VpcIdSetItemType.java | 8 +-
awsapi/src/com/amazon/ec2/VpcIdSetType.java | 11 +-
awsapi/src/com/amazon/ec2/VpcSetType.java | 8 +-
awsapi/src/com/amazon/ec2/VpcType.java | 8 +-
.../amazon/ec2/VpnConnectionIdSetItemType.java | 8 +-
.../com/amazon/ec2/VpnConnectionIdSetType.java | 8 +-
.../ec2/VpnConnectionOptionsRequestType.java | 8 +-
.../ec2/VpnConnectionOptionsResponseType.java | 8 +-
.../com/amazon/ec2/VpnConnectionSetType.java | 12 +-
.../src/com/amazon/ec2/VpnConnectionType.java | 11 +-
.../com/amazon/ec2/VpnGatewayIdSetItemType.java | 8 +-
.../src/com/amazon/ec2/VpnGatewayIdSetType.java | 8 +-
.../src/com/amazon/ec2/VpnGatewaySetType.java | 11 +-
awsapi/src/com/amazon/ec2/VpnGatewayType.java | 8 +-
.../src/com/amazon/ec2/VpnStaticRouteType.java | 8 +-
.../com/amazon/ec2/VpnStaticRoutesSetType.java | 12 +-
.../com/amazon/ec2/VpnTunnelTelemetryType.java | 8 +-
.../com/amazon/ec2/client/AmazonEC2Stub.java | 14098 ++++++++++-------
awsapi/src/com/amazon/s3/AccessControlList.java | 8 +-
.../src/com/amazon/s3/AccessControlPolicy.java | 8 +-
.../com/amazon/s3/AmazonCustomerByEmail.java | 8 +-
.../amazon/s3/AmazonS3MessageReceiverInOut.java | 139 +-
.../src/com/amazon/s3/BucketLoggingStatus.java | 8 +-
awsapi/src/com/amazon/s3/CanonicalUser.java | 8 +-
awsapi/src/com/amazon/s3/CopyObject.java | 17 +-
.../src/com/amazon/s3/CopyObjectResponse.java | 8 +-
awsapi/src/com/amazon/s3/CopyObjectResult.java | 8 +-
awsapi/src/com/amazon/s3/CreateBucket.java | 8 +-
.../amazon/s3/CreateBucketConfiguration.java | 8 +-
.../src/com/amazon/s3/CreateBucketResponse.java | 8 +-
.../src/com/amazon/s3/CreateBucketResult.java | 8 +-
awsapi/src/com/amazon/s3/DeleteBucket.java | 8 +-
.../src/com/amazon/s3/DeleteBucketResponse.java | 8 +-
awsapi/src/com/amazon/s3/DeleteMarkerEntry.java | 8 +-
awsapi/src/com/amazon/s3/DeleteObject.java | 8 +-
.../src/com/amazon/s3/DeleteObjectResponse.java | 8 +-
awsapi/src/com/amazon/s3/ExtensionMapper.java | 3 +-
.../amazon/s3/GetBucketAccessControlPolicy.java | 11 +-
.../GetBucketAccessControlPolicyResponse.java | 15 +-
.../com/amazon/s3/GetBucketLoggingStatus.java | 8 +-
.../s3/GetBucketLoggingStatusResponse.java | 18 +-
awsapi/src/com/amazon/s3/GetObject.java | 8 +-
.../amazon/s3/GetObjectAccessControlPolicy.java | 11 +-
.../GetObjectAccessControlPolicyResponse.java | 15 +-
awsapi/src/com/amazon/s3/GetObjectExtended.java | 8 +-
.../amazon/s3/GetObjectExtendedResponse.java | 8 +-
awsapi/src/com/amazon/s3/GetObjectResponse.java | 8 +-
awsapi/src/com/amazon/s3/GetObjectResult.java | 14 +-
awsapi/src/com/amazon/s3/Grant.java | 8 +-
awsapi/src/com/amazon/s3/Grantee.java | 8 +-
awsapi/src/com/amazon/s3/Group.java | 8 +-
awsapi/src/com/amazon/s3/ListAllMyBuckets.java | 8 +-
.../com/amazon/s3/ListAllMyBucketsEntry.java | 8 +-
.../src/com/amazon/s3/ListAllMyBucketsList.java | 8 +-
.../com/amazon/s3/ListAllMyBucketsResponse.java | 11 +-
.../com/amazon/s3/ListAllMyBucketsResult.java | 8 +-
awsapi/src/com/amazon/s3/ListBucket.java | 8 +-
.../src/com/amazon/s3/ListBucketResponse.java | 8 +-
awsapi/src/com/amazon/s3/ListBucketResult.java | 14 +-
awsapi/src/com/amazon/s3/ListEntry.java | 8 +-
.../src/com/amazon/s3/ListVersionsResponse.java | 8 +-
.../src/com/amazon/s3/ListVersionsResult.java | 17 +-
.../s3/ListVersionsResultChoice_type0.java | 8 +-
.../src/com/amazon/s3/LocationConstraint.java | 8 +-
awsapi/src/com/amazon/s3/LoggingSettings.java | 8 +-
awsapi/src/com/amazon/s3/MetadataDirective.java | 16 +-
awsapi/src/com/amazon/s3/MetadataEntry.java | 8 +-
awsapi/src/com/amazon/s3/MfaDeleteStatus.java | 14 +-
.../amazon/s3/NotificationConfiguration.java | 11 +-
awsapi/src/com/amazon/s3/Payer.java | 13 +-
awsapi/src/com/amazon/s3/Permission.java | 15 +-
awsapi/src/com/amazon/s3/PostResponse.java | 8 +-
awsapi/src/com/amazon/s3/PrefixEntry.java | 8 +-
awsapi/src/com/amazon/s3/PutObject.java | 11 +-
awsapi/src/com/amazon/s3/PutObjectInline.java | 14 +-
.../com/amazon/s3/PutObjectInlineResponse.java | 11 +-
awsapi/src/com/amazon/s3/PutObjectResponse.java | 8 +-
awsapi/src/com/amazon/s3/PutObjectResult.java | 8 +-
.../amazon/s3/RequestPaymentConfiguration.java | 8 +-
awsapi/src/com/amazon/s3/Result.java | 8 +-
.../amazon/s3/SetBucketAccessControlPolicy.java | 11 +-
.../SetBucketAccessControlPolicyResponse.java | 11 +-
.../com/amazon/s3/SetBucketLoggingStatus.java | 8 +-
.../s3/SetBucketLoggingStatusResponse.java | 11 +-
.../amazon/s3/SetObjectAccessControlPolicy.java | 11 +-
.../SetObjectAccessControlPolicyResponse.java | 11 +-
awsapi/src/com/amazon/s3/Status.java | 8 +-
awsapi/src/com/amazon/s3/StorageClass.java | 14 +-
.../src/com/amazon/s3/TopicConfiguration.java | 8 +-
awsapi/src/com/amazon/s3/User.java | 8 +-
awsapi/src/com/amazon/s3/VersionEntry.java | 8 +-
.../com/amazon/s3/VersioningConfiguration.java | 8 +-
awsapi/src/com/amazon/s3/VersioningStatus.java | 16 +-
.../src/com/amazon/s3/client/AmazonS3Stub.java | 1170 +-
.../bridge/auth/ec2/AuthenticationHandler.java | 1 -
.../bridge/auth/ec2/AuthenticationModule.java | 5 +-
.../bridge/auth/s3/AuthenticationModule.java | 5 +-
.../bridge/io/DimeDelimitedInputStream.java | 10 +-
.../bridge/io/MTOMAwareResultStreamWriter.java | 4 +-
.../bridge/io/MultiPartDimeInputStream.java | 6 +-
.../cloud/bridge/io/S3CAStorBucketAdapter.java | 48 +-
.../bridge/io/S3FileSystemBucketAdapter.java | 5 +-
.../lifecycle/ServiceEngineLifecycle.java | 1 -
.../model/CloudStackServiceOfferingVO.java | 2 -
awsapi/src/com/cloud/bridge/model/SAcl.java | 7 -
awsapi/src/com/cloud/bridge/model/SBucket.java | 5 -
.../src/com/cloud/bridge/model/SBucketVO.java | 1 -
awsapi/src/com/cloud/bridge/model/SHost.java | 4 -
.../com/cloud/bridge/model/SObjectItemVO.java | 1 -
.../cloud/bridge/model/UserCredentialsVO.java | 2 -
.../persist/dao/CloudStackAccountDaoImpl.java | 1 -
.../dao/CloudStackConfigurationDaoImpl.java | 1 -
.../dao/CloudStackSvcOfferingDaoImpl.java | 4 -
.../persist/dao/CloudStackUserDaoImpl.java | 3 +-
.../cloud/bridge/persist/dao/MHostDaoImpl.java | 1 -
.../bridge/persist/dao/MHostMountDaoImpl.java | 1 -
.../persist/dao/MultiPartPartsDaoImpl.java | 1 -
.../persist/dao/MultiPartUploadsDaoImpl.java | 4 -
.../bridge/persist/dao/MultipartLoadDao.java | 4 +-
.../persist/dao/MultipartMetaDaoImpl.java | 1 -
.../bridge/persist/dao/OfferingDaoImpl.java | 3 -
.../cloud/bridge/persist/dao/SAclDaoImpl.java | 1 -
.../bridge/persist/dao/SBucketDaoImpl.java | 2 -
.../cloud/bridge/persist/dao/SHostDaoImpl.java | 1 -
.../cloud/bridge/persist/dao/SMetaDaoImpl.java | 1 -
.../bridge/persist/dao/SObjectDaoImpl.java | 1 -
.../bridge/persist/dao/SObjectItemDaoImpl.java | 1 -
.../persist/dao/UserCredentialsDaoImpl.java | 3 -
.../cloud/bridge/service/EC2MainServlet.java | 1 -
.../cloud/bridge/service/EC2RestServlet.java | 51 +-
.../cloud/bridge/service/EC2SoapService.java | 291 +-
.../bridge/service/EC2SoapServiceImpl.java | 481 +-
.../com/cloud/bridge/service/S3RestServlet.java | 5 +-
.../service/controller/s3/S3BucketAction.java | 5 +-
.../service/controller/s3/S3ObjectAction.java | 15 +-
.../s3/S3SerializableServiceImplementation.java | 5 +-
.../service/controller/s3/ServiceProvider.java | 5 +-
.../bridge/service/core/ec2/EC2Engine.java | 67 +-
.../service/core/ec2/EC2RegisterImage.java | 3 +-
.../core/ec2/EC2RunInstancesResponse.java | 2 -
.../service/core/ec2/EC2SnapshotFilterSet.java | 1 -
.../service/core/ec2/EC2VolumeFilterSet.java | 2 +-
.../cloud/bridge/service/core/s3/S3Engine.java | 24 +-
.../cloud/bridge/service/core/s3/S3Grant.java | 3 -
.../core/s3/S3ListAllMyBucketsEntry.java | 1 -
.../service/core/s3/S3PolicyArnCondition.java | 2 +-
.../service/core/s3/S3PolicyCondition.java | 17 +-
.../service/core/s3/S3PolicyDateCondition.java | 4 +-
.../core/s3/S3PolicyIPAddressCondition.java | 2 +-
.../core/s3/S3PolicyNumericCondition.java | 4 +-
.../core/s3/S3PolicyStringCondition.java | 4 +-
.../com/cloud/bridge/tool/CloudS3CmdTool.java | 2 +-
.../cloud/bridge/util/AuthenticationUtils.java | 7 +-
.../util/ISO8601SimpleDateTimeFormat.java | 5 +-
.../com/cloud/bridge/util/IpAddressRange.java | 2 -
.../src/com/cloud/bridge/util/JsonAccessor.java | 3 +-
.../src/com/cloud/bridge/util/PolicyParser.java | 10 +-
awsapi/src/com/cloud/bridge/util/RestAuth.java | 11 +-
.../bridge/util/XSerializerJsonAdapter.java | 3 +-
.../bridge/util/XSerializerXmlAdapter.java | 3 +-
awsapi/src/com/cloud/bridge/util/XmlHelper.java | 16 +-
awsapi/src/com/cloud/stack/CloudStackApi.java | 117 +-
.../src/com/cloud/stack/CloudStackClient.java | 12 +-
.../com/cloud/gate/service/ServiceTestCase.java | 1 +
.../gate/util/CloudStackClientTestCase.java | 8 +-
.../cloud/gate/util/JsonAccessorTestCase.java | 10 +-
.../test/com/cloud/gate/util/UtilTestCase.java | 4 +-
.../cloud/agent/api/AgentControlCommand.java | 1 +
.../cloud/agent/api/AttachVolumeCommand.java | 4 +-
.../cloud/agent/api/BackupSnapshotCommand.java | 4 +-
...reatePrivateTemplateFromSnapshotCommand.java | 4 +-
.../CreatePrivateTemplateFromVolumeCommand.java | 9 +-
.../cloud/agent/api/CreateVMSnapshotAnswer.java | 4 +-
.../agent/api/CreateVMSnapshotCommand.java | 5 +-
.../api/CreateVolumeFromVMSnapshotCommand.java | 3 +-
.../cloud/agent/api/DeleteVMSnapshotAnswer.java | 4 +-
.../agent/api/DeleteVMSnapshotCommand.java | 1 -
.../src/com/cloud/agent/api/HostStatsEntry.java | 4 +-
.../agent/api/MigrateWithStorageCommand.java | 3 +-
.../api/MigrateWithStorageReceiveAnswer.java | 6 +-
.../api/MigrateWithStorageReceiveCommand.java | 3 +-
.../agent/api/MigrateWithStorageSendAnswer.java | 1 +
.../api/MigrateWithStorageSendCommand.java | 3 +-
.../agent/api/ModifyStoragePoolAnswer.java | 3 +-
.../agent/api/PingRoutingWithOvsCommand.java | 3 +-
.../agent/api/RecurringNetworkUsageCommand.java | 1 +
.../agent/api/RevertToVMSnapshotAnswer.java | 5 +-
.../agent/api/SetupGuestNetworkCommand.java | 3 +-
.../cloud/agent/api/StartupRoutingCommand.java | 14 +-
.../cloud/agent/api/StartupVMMAgentCommand.java | 1 -
.../cloud/agent/api/VMSnapshotBaseCommand.java | 2 -
.../com/cloud/agent/api/VmDiskStatsEntry.java | 4 +
core/src/com/cloud/agent/api/VmStatsEntry.java | 7 +
.../api/proxy/WatchConsoleProxyLoadCommand.java | 1 +
.../agent/api/routing/DnsMasqConfigCommand.java | 4 +-
.../GlobalLoadBalancerConfigCommand.java | 4 +-
.../api/routing/SetMonitorServiceCommand.java | 3 +-
.../agent/api/storage/CopyVolumeCommand.java | 3 +-
.../storage/CreatePrivateTemplateAnswer.java | 3 +-
.../cloud/agent/api/storage/DestroyCommand.java | 5 +-
.../virtualnetwork/VirtualRoutingResource.java | 10 +-
.../cloud/agent/transport/ArrayTypeAdaptor.java | 3 +-
.../agent/transport/InterfaceTypeAdaptor.java | 3 +-
.../transport/LoggingExclusionStrategy.java | 5 +-
.../com/cloud/network/HAProxyConfigurator.java | 23 +-
.../resource/TrafficSentinelResource.java | 5 +-
.../com/cloud/resource/ResourceListener.java | 4 +-
.../com/cloud/resource/ServerResourceBase.java | 2 +-
core/src/com/cloud/serializer/GsonHelper.java | 7 +-
.../com/cloud/serializer/SerializerHelper.java | 5 +-
.../storage/resource/StorageProcessor.java | 2 -
.../StorageSubsystemCommandHandlerBase.java | 7 +-
.../template/HttpTemplateDownloader.java | 5 +-
.../cloud/storage/template/IsoProcessor.java | 2 +-
.../com/cloud/storage/template/Processor.java | 4 +-
.../cloud/storage/template/QCOW2Processor.java | 1 +
.../storage/template/S3TemplateDownloader.java | 4 +-
.../template/TemplateDownloaderBase.java | 4 +-
.../storage/template/TemplateLocation.java | 3 +-
.../cloud/storage/template/VhdProcessor.java | 2 +-
.../cloud/storage/template/VmdkProcessor.java | 3 +-
.../storage/to/PrimaryDataStoreTO.java | 1 -
.../cloudstack/storage/to/SnapshotObjectTO.java | 2 +-
.../cloudstack/storage/to/TemplateObjectTO.java | 2 +-
.../cloudstack/storage/to/VolumeObjectTO.java | 2 +-
.../cloud/network/HAProxyConfiguratorTest.java | 3 +-
.../agent/test/BackupSnapshotAnswerTest.java | 5 +-
.../agent/test/BackupSnapshotCommandTest.java | 8 +-
.../api/agent/test/CheckNetworkAnswerTest.java | 18 +-
.../api/agent/test/CheckOnHostCommandTest.java | 39 +
.../api/agent/test/SnapshotCommandTest.java | 19 +
.../src/com/cloud/vm/VirtualMachineManager.java | 9 +-
.../cloud/entity/api/VirtualMachineEntity.java | 3 +-
.../entity/api/DataCenterResourceEntity.java | 1 -
.../engine/datacenter/entity/api/PodEntity.java | 1 -
.../engine/entity/api/CloudStackEntity.java | 1 -
.../service/NetworkOrchestrationService.java | 14 +-
.../service/VolumeOrchestrationService.java | 7 +-
.../service/api/OrchestrationService.java | 13 +-
.../subsystem/api/storage/DataStoreDriver.java | 7 +-
.../api/storage/DataStoreProviderManager.java | 2 -
.../storage/ObjectInDataStoreStateMachine.java | 10 +-
.../subsystem/api/storage/PrimaryDataStore.java | 6 -
.../api/storage/PrimaryDataStoreInfo.java | 2 +
.../subsystem/api/storage/TemplateInfo.java | 1 +
.../engine/subsystem/api/storage/ScopeTest.java | 1 -
.../src/com/cloud/agent/AgentManager.java | 3 +-
.../src/com/cloud/alert/AlertManager.java | 12 +-
.../src/com/cloud/capacity/CapacityManager.java | 14 +-
.../configuration/ConfigurationManager.java | 18 +-
.../src/com/cloud/event/UsageEventUtils.java | 21 +-
.../src/com/cloud/network/IpAddressManager.java | 26 +-
.../com/cloud/network/NetworkStateListener.java | 4 +-
.../network/lb/LoadBalancingRulesManager.java | 2 +-
.../cloud/network/rules/FirewallManager.java | 8 +-
.../cloud/network/vpc/NetworkACLManager.java | 5 +-
.../src/com/cloud/network/vpc/VpcManager.java | 9 +-
.../cloud/resource/ResourceStateAdapter.java | 5 +-
.../com/cloud/agent/manager/AgentAttache.java | 9 +-
.../cloud/agent/manager/AgentManagerImpl.java | 49 +-
.../agent/manager/ClusteredAgentAttache.java | 5 +-
.../manager/ClusteredAgentManagerImpl.java | 64 +-
.../manager/ClusteredDirectAgentAttache.java | 4 +-
.../cloud/agent/manager/DirectAgentAttache.java | 9 +-
.../agent/manager/SynchronousListener.java | 3 +-
.../ClusterBasedAgentLoadBalancerPlanner.java | 7 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 190 +-
.../cloud/entity/api/VMEntityManager.java | 8 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 22 +-
.../entity/api/VirtualMachineEntityImpl.java | 13 +-
.../entity/api/ClusterEntityImpl.java | 1 +
.../api/DataCenterResourceManagerImpl.java | 3 +-
.../datacenter/entity/api/ZoneEntityImpl.java | 3 +
.../entity/api/db/EngineDataCenterVO.java | 4 +-
.../datacenter/entity/api/db/EngineHostVO.java | 15 +-
.../entity/api/db/dao/DcDetailsDaoImpl.java | 3 +-
.../entity/api/db/dao/EngineClusterDaoImpl.java | 15 +-
.../api/db/dao/EngineDataCenterDaoImpl.java | 5 +-
.../entity/api/db/dao/EngineHostDao.java | 4 +-
.../entity/api/db/dao/EngineHostDaoImpl.java | 24 +-
.../entity/api/db/dao/EngineHostPodDaoImpl.java | 9 +-
.../entity/api/db/dao/HostTagsDao.java | 1 +
.../engine/orchestration/CloudOrchestrator.java | 17 +-
.../orchestration/NetworkOrchestrator.java | 239 +-
.../orchestration/VolumeOrchestrator.java | 63 +-
.../service/api/ProvisioningServiceImpl.java | 5 +-
.../cloud/vm/VirtualMachineManagerImplTest.java | 19 +-
.../test/ChildTestConfiguration.java | 5 +-
.../provisioning/test/ProvisioningTest.java | 49 +-
.../src/com/cloud/capacity/CapacityVO.java | 3 +-
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 164 +-
.../com/cloud/certificate/CertificateVO.java | 5 +-
.../cluster/agentlb/HostTransferMapVO.java | 4 +-
.../cloud/configuration/ResourceCountVO.java | 2 -
.../cloud/configuration/ResourceLimitVO.java | 2 -
.../configuration/dao/ResourceCountDaoImpl.java | 2 -
.../src/com/cloud/dc/AccountVlanMapVO.java | 4 +-
.../src/com/cloud/dc/ClusterDetailsVO.java | 5 +-
engine/schema/src/com/cloud/dc/ClusterVO.java | 12 +-
.../src/com/cloud/dc/DataCenterIpAddressVO.java | 5 +-
.../dc/DataCenterLinkLocalIpAddressVO.java | 5 +-
.../schema/src/com/cloud/dc/DataCenterVO.java | 7 +-
.../src/com/cloud/dc/DataCenterVnetVO.java | 5 +-
engine/schema/src/com/cloud/dc/HostPodVO.java | 7 +-
.../schema/src/com/cloud/dc/PodVlanMapVO.java | 5 +-
engine/schema/src/com/cloud/dc/PodVlanVO.java | 5 +-
.../com/cloud/dc/StorageNetworkIpAddressVO.java | 5 +-
.../com/cloud/dc/StorageNetworkIpRangeVO.java | 12 +-
engine/schema/src/com/cloud/dc/VlanVO.java | 38 +-
.../src/com/cloud/dc/dao/ClusterDaoImpl.java | 3 +-
.../com/cloud/dc/dao/ClusterVSMMapDaoImpl.java | 2 +
.../src/com/cloud/dc/dao/DataCenterDaoImpl.java | 1 -
.../dc/dao/DataCenterIpAddressDaoImpl.java | 9 +-
.../DataCenterLinkLocalIpAddressDaoImpl.java | 7 +
.../src/com/cloud/dc/dao/DataCenterVnetDao.java | 1 -
.../com/cloud/dc/dao/DataCenterVnetDaoImpl.java | 11 +
.../schema/src/com/cloud/dc/dao/HostPodDao.java | 1 -
.../src/com/cloud/dc/dao/PodVlanDaoImpl.java | 6 +-
.../dc/dao/StorageNetworkIpAddressDaoImpl.java | 2 -
engine/schema/src/com/cloud/dc/dao/VlanDao.java | 4 +-
.../src/com/cloud/dc/dao/VlanDaoImpl.java | 27 +-
.../schema/src/com/cloud/domain/DomainVO.java | 8 +-
.../src/com/cloud/domain/dao/DomainDaoImpl.java | 6 +-
engine/schema/src/com/cloud/event/EventVO.java | 1 +
.../src/com/cloud/event/UsageEventVO.java | 1 -
.../src/com/cloud/event/dao/EventDaoImpl.java | 2 +-
.../com/cloud/event/dao/UsageEventDaoImpl.java | 10 +-
.../event/dao/UsageEventDetailsDaoImpl.java | 16 +-
engine/schema/src/com/cloud/host/DetailVO.java | 5 +-
engine/schema/src/com/cloud/host/HostTagVO.java | 5 +-
engine/schema/src/com/cloud/host/HostVO.java | 17 +-
.../src/com/cloud/host/dao/HostDaoImpl.java | 24 +-
.../src/com/cloud/host/dao/HostTagsDao.java | 1 +
.../hypervisor/HypervisorCapabilitiesVO.java | 6 +-
.../dao/HypervisorCapabilitiesDaoImpl.java | 12 +-
.../src/com/cloud/keystore/KeystoreDaoImpl.java | 3 +-
.../src/com/cloud/keystore/KeystoreVO.java | 5 +-
.../cloud/network/LBHealthCheckPolicyVO.java | 15 +-
.../com/cloud/network/UserIpv6AddressVO.java | 2 +-
.../schema/src/com/cloud/network/VpnUserVO.java | 2 -
.../as/AutoScalePolicyConditionMapVO.java | 5 +-
.../com/cloud/network/as/AutoScalePolicyVO.java | 4 +-
.../network/as/AutoScaleVmGroupPolicyMapVO.java | 5 +-
.../cloud/network/as/AutoScaleVmGroupVO.java | 6 +-
.../cloud/network/as/AutoScaleVmProfileVO.java | 3 +-
.../src/com/cloud/network/as/ConditionVO.java | 3 +-
.../src/com/cloud/network/as/CounterVO.java | 3 +-
.../dao/AutoScalePolicyConditionMapDaoImpl.java | 1 +
.../network/as/dao/AutoScalePolicyDaoImpl.java | 1 +
.../cloud/network/as/dao/ConditionDaoImpl.java | 1 +
.../network/dao/AccountGuestVlanMapDao.java | 5 +-
.../network/dao/AccountGuestVlanMapDaoImpl.java | 5 +-
.../network/dao/AccountGuestVlanMapVO.java | 12 +-
.../dao/ExternalFirewallDeviceDaoImpl.java | 4 +-
.../network/dao/ExternalFirewallDeviceVO.java | 8 +-
.../dao/ExternalLoadBalancerDeviceDao.java | 4 +-
.../dao/ExternalLoadBalancerDeviceDaoImpl.java | 11 +-
.../dao/ExternalLoadBalancerDeviceVO.java | 19 +-
.../cloud/network/dao/FirewallRulesCidrsVO.java | 5 +-
.../cloud/network/dao/FirewallRulesDaoImpl.java | 3 +-
.../src/com/cloud/network/dao/IPAddressDao.java | 6 +-
.../com/cloud/network/dao/IPAddressDaoImpl.java | 30 +-
.../src/com/cloud/network/dao/IPAddressVO.java | 2 +
.../network/dao/InlineLoadBalancerNicMapVO.java | 5 +-
.../cloud/network/dao/LBStickinessPolicyVO.java | 9 +-
.../network/dao/LoadBalancerCertMapDao.java | 5 +-
.../network/dao/LoadBalancerCertMapDaoImpl.java | 9 +-
.../network/dao/LoadBalancerCertMapVO.java | 5 +-
.../cloud/network/dao/LoadBalancerVMMapVO.java | 5 +-
.../com/cloud/network/dao/LoadBalancerVO.java | 5 +-
.../cloud/network/dao/MonitoringServiceDao.java | 4 +-
.../network/dao/MonitoringServiceDaoImpl.java | 10 +-
.../cloud/network/dao/MonitoringServiceVO.java | 13 +-
.../com/cloud/network/dao/NetworkAccountVO.java | 3 +-
.../src/com/cloud/network/dao/NetworkDao.java | 2 +-
.../com/cloud/network/dao/NetworkDaoImpl.java | 21 +-
.../network/dao/NetworkDetailsDaoImpl.java | 3 +-
.../cloud/network/dao/NetworkDomainDaoImpl.java | 2 +-
.../com/cloud/network/dao/NetworkDomainVO.java | 3 +-
.../network/dao/NetworkExternalFirewallVO.java | 4 +-
.../dao/NetworkExternalLoadBalancerVO.java | 4 +-
.../com/cloud/network/dao/NetworkOpDaoImpl.java | 7 +-
.../src/com/cloud/network/dao/NetworkOpVO.java | 5 +-
.../network/dao/NetworkRuleConfigDaoImpl.java | 2 +
.../cloud/network/dao/NetworkServiceMapVO.java | 6 +-
.../src/com/cloud/network/dao/NetworkVO.java | 18 +-
.../PhysicalNetworkIsolationMethodDaoImpl.java | 3 +-
.../dao/PhysicalNetworkIsolationMethodVO.java | 5 +-
.../dao/PhysicalNetworkServiceProviderVO.java | 3 +-
.../cloud/network/dao/PhysicalNetworkTagVO.java | 5 +-
.../dao/PhysicalNetworkTrafficTypeVO.java | 5 +-
.../com/cloud/network/dao/PortProfileDao.java | 1 +
.../cloud/network/dao/PortProfileDaoImpl.java | 9 +-
.../com/cloud/network/dao/PortProfileVO.java | 5 +-
.../cloud/network/dao/RouterNetworkDaoImpl.java | 3 +-
.../com/cloud/network/dao/RouterNetworkVO.java | 4 +-
.../network/dao/Site2SiteCustomerGatewayVO.java | 6 +-
.../network/dao/Site2SiteVpnConnectionVO.java | 6 +-
.../network/dao/Site2SiteVpnGatewayVO.java | 2 +-
.../src/com/cloud/network/dao/SslCertDao.java | 4 +-
.../com/cloud/network/dao/SslCertDaoImpl.java | 7 +-
.../src/com/cloud/network/dao/SslCertVO.java | 9 +-
.../cloud/network/dao/UserIpv6AddressDao.java | 1 -
.../network/dao/UserIpv6AddressDaoImpl.java | 6 -
.../network/dao/VirtualRouterProviderDao.java | 3 +-
.../dao/VirtualRouterProviderDaoImpl.java | 2 +-
.../element/VirtualRouterProviderVO.java | 2 +-
.../com/cloud/network/rules/FirewallRuleVO.java | 12 +-
.../rules/dao/PortForwardingRulesDaoImpl.java | 3 -
.../network/security/SecurityGroupRulesVO.java | 5 +-
.../network/security/SecurityGroupVMMapVO.java | 8 +-
.../cloud/network/security/SecurityGroupVO.java | 3 -
.../network/security/SecurityGroupWork.java | 2 -
.../network/security/SecurityGroupWorkVO.java | 8 +-
.../cloud/network/security/VmRulesetLogVO.java | 4 +-
.../security/dao/SecurityGroupDaoImpl.java | 2 -
.../security/dao/SecurityGroupRuleDaoImpl.java | 2 +
.../security/dao/SecurityGroupVMMapDaoImpl.java | 5 -
.../security/dao/SecurityGroupWorkDao.java | 2 +-
.../security/dao/VmRulesetLogDaoImpl.java | 2 +-
.../cloud/network/vpc/NetworkACLItemDao.java | 4 +-
.../com/cloud/network/vpc/NetworkACLItemVO.java | 22 +-
.../src/com/cloud/network/vpc/NetworkACLVO.java | 8 +-
.../src/com/cloud/network/vpc/PrivateIpVO.java | 5 +-
.../com/cloud/network/vpc/StaticRouteVO.java | 2 -
.../src/com/cloud/network/vpc/VpcGatewayVO.java | 4 +-
.../network/vpc/VpcOfferingServiceMapVO.java | 5 +-
.../com/cloud/network/vpc/VpcOfferingVO.java | 1 -
.../com/cloud/network/vpc/VpcServiceMapVO.java | 1 +
.../network/vpc/dao/NetworkACLDaoImpl.java | 7 +-
.../network/vpc/dao/NetworkACLItemDaoImpl.java | 16 +-
.../network/vpc/dao/StaticRouteDaoImpl.java | 2 -
.../com/cloud/network/vpc/dao/VpcDaoImpl.java | 5 +-
.../network/vpc/dao/VpcGatewayDaoImpl.java | 4 +-
.../network/vpc/dao/VpcServiceMapDaoImpl.java | 3 +-
.../offerings/NetworkOfferingDetailsVO.java | 1 +
.../offerings/NetworkOfferingServiceMapVO.java | 5 +-
.../com/cloud/offerings/NetworkOfferingVO.java | 16 +-
.../com/cloud/projects/ProjectAccountVO.java | 4 +-
.../com/cloud/projects/ProjectInvitationVO.java | 2 -
.../src/com/cloud/projects/ProjectVO.java | 3 +-
.../com/cloud/projects/dao/ProjectDaoImpl.java | 2 -
.../com/cloud/secstorage/CommandExecLogVO.java | 4 +-
.../com/cloud/service/ServiceOfferingVO.java | 27 +-
.../cloud/service/dao/ServiceOfferingDao.java | 1 -
.../service/dao/ServiceOfferingDaoImpl.java | 9 +-
.../dao/ServiceOfferingDetailsDaoImpl.java | 3 +-
.../src/com/cloud/storage/DiskOfferingVO.java | 12 +-
.../com/cloud/storage/GuestOSHypervisorVO.java | 5 -
.../schema/src/com/cloud/storage/GuestOSVO.java | 1 +
.../com/cloud/storage/LaunchPermissionVO.java | 5 +-
.../src/com/cloud/storage/SnapshotPolicyVO.java | 12 +
.../com/cloud/storage/SnapshotScheduleVO.java | 10 +
.../src/com/cloud/storage/SnapshotVO.java | 19 +-
.../com/cloud/storage/StoragePoolHostAssoc.java | 4 +-
.../com/cloud/storage/StoragePoolWorkVO.java | 6 +-
.../src/com/cloud/storage/VMTemplateHostVO.java | 4 +-
.../cloud/storage/VMTemplateStoragePoolVO.java | 4 +-
.../src/com/cloud/storage/VMTemplateVO.java | 57 +-
.../src/com/cloud/storage/VMTemplateZoneVO.java | 4 +-
.../src/com/cloud/storage/VolumeHostVO.java | 10 +-
.../schema/src/com/cloud/storage/VolumeVO.java | 8 +-
.../storage/dao/LaunchPermissionDaoImpl.java | 19 +-
.../src/com/cloud/storage/dao/SnapshotDao.java | 4 +-
.../com/cloud/storage/dao/SnapshotDaoImpl.java | 8 +-
.../cloud/storage/dao/SnapshotDetailsDao.java | 3 +-
.../cloud/storage/dao/SnapshotDetailsVO.java | 9 +-
.../storage/dao/StoragePoolHostDaoImpl.java | 5 +-
.../storage/dao/StoragePoolWorkDaoImpl.java | 6 +-
.../src/com/cloud/storage/dao/UploadDao.java | 4 +-
.../com/cloud/storage/dao/UploadDaoImpl.java | 12 +-
.../com/cloud/storage/dao/VMTemplateDao.java | 4 -
.../cloud/storage/dao/VMTemplateDaoImpl.java | 24 +-
.../storage/dao/VMTemplateDetailsDaoImpl.java | 3 +-
.../storage/dao/VMTemplateHostDaoImpl.java | 15 +-
.../storage/dao/VMTemplatePoolDaoImpl.java | 19 +-
.../com/cloud/storage/dao/VolumeDaoImpl.java | 13 +-
.../cloud/storage/dao/VolumeDetailsDaoImpl.java | 3 +-
.../com/cloud/storage/dao/VolumeHostDao.java | 3 +-
.../cloud/storage/dao/VolumeHostDaoImpl.java | 5 +-
.../src/com/cloud/tags/ResourceTagVO.java | 2 -
.../src/com/cloud/upgrade/DatabaseCreator.java | 8 +-
.../cloud/upgrade/DatabaseIntegrityChecker.java | 13 +-
.../cloud/upgrade/DatabaseUpgradeChecker.java | 113 +-
.../upgrade/PremiumDatabaseUpgradeChecker.java | 71 +-
.../com/cloud/upgrade/dao/Upgrade218to22.java | 245 +-
.../upgrade/dao/Upgrade218to22Premium.java | 14 +-
.../cloud/upgrade/dao/Upgrade2211to2212.java | 2 -
.../cloud/upgrade/dao/Upgrade2212to2213.java | 3 +-
.../cloud/upgrade/dao/Upgrade2213to2214.java | 36 +-
.../com/cloud/upgrade/dao/Upgrade2214to30.java | 81 +-
.../com/cloud/upgrade/dao/Upgrade222to224.java | 14 +-
.../upgrade/dao/Upgrade222to224Premium.java | 9 +-
.../com/cloud/upgrade/dao/Upgrade224to225.java | 12 +-
.../com/cloud/upgrade/dao/Upgrade227to228.java | 9 +-
.../com/cloud/upgrade/dao/Upgrade228to229.java | 6 +-
.../com/cloud/upgrade/dao/Upgrade229to2210.java | 16 +-
.../com/cloud/upgrade/dao/Upgrade301to302.java | 23 +-
.../com/cloud/upgrade/dao/Upgrade302to303.java | 42 +-
.../com/cloud/upgrade/dao/Upgrade302to40.java | 169 +-
.../com/cloud/upgrade/dao/Upgrade303to304.java | 74 +-
.../com/cloud/upgrade/dao/Upgrade304to305.java | 55 +-
.../com/cloud/upgrade/dao/Upgrade305to306.java | 12 +-
.../com/cloud/upgrade/dao/Upgrade30to301.java | 5 +-
.../com/cloud/upgrade/dao/Upgrade30xBase.java | 29 +-
.../com/cloud/upgrade/dao/Upgrade40to41.java | 28 +-
.../com/cloud/upgrade/dao/Upgrade410to420.java | 256 +-
.../com/cloud/upgrade/dao/Upgrade420to421.java | 38 +-
.../src/com/cloud/upgrade/dao/VersionVO.java | 5 +-
.../usage/ExternalPublicIpStatisticsVO.java | 6 +-
.../src/com/cloud/usage/UsageIPAddressVO.java | 5 +-
.../schema/src/com/cloud/usage/UsageJobVO.java | 5 +-
.../cloud/usage/UsageLoadBalancerPolicyVO.java | 5 +-
.../com/cloud/usage/UsageNetworkOfferingVO.java | 3 +-
.../src/com/cloud/usage/UsageNetworkVO.java | 4 +-
.../cloud/usage/UsagePortForwardingRuleVO.java | 5 +-
.../src/com/cloud/usage/UsageStorageVO.java | 5 +-
.../src/com/cloud/usage/UsageVMInstanceVO.java | 4 +-
.../src/com/cloud/usage/UsageVMSnapshotVO.java | 1 +
engine/schema/src/com/cloud/usage/UsageVO.java | 27 +-
.../src/com/cloud/usage/UsageVmDiskVO.java | 4 +-
.../src/com/cloud/usage/UsageVolumeVO.java | 5 +-
.../dao/ExternalPublicIpStatisticsDao.java | 1 -
.../dao/ExternalPublicIpStatisticsDaoImpl.java | 5 +-
.../src/com/cloud/usage/dao/UsageDaoImpl.java | 25 +-
.../cloud/usage/dao/UsageIPAddressDaoImpl.java | 22 +-
.../com/cloud/usage/dao/UsageJobDaoImpl.java | 3 +-
.../dao/UsageLoadBalancerPolicyDaoImpl.java | 11 +-
.../cloud/usage/dao/UsageNetworkDaoImpl.java | 21 +-
.../usage/dao/UsageNetworkOfferingDaoImpl.java | 23 +-
.../dao/UsagePortForwardingRuleDaoImpl.java | 11 +-
.../usage/dao/UsageSecurityGroupDaoImpl.java | 16 +-
.../cloud/usage/dao/UsageStorageDaoImpl.java | 17 +-
.../cloud/usage/dao/UsageVMInstanceDaoImpl.java | 17 +-
.../cloud/usage/dao/UsageVMSnapshotDaoImpl.java | 28 +-
.../cloud/usage/dao/UsageVPNUserDaoImpl.java | 10 +-
.../com/cloud/usage/dao/UsageVmDiskDaoImpl.java | 23 +-
.../com/cloud/usage/dao/UsageVolumeDaoImpl.java | 13 +-
.../src/com/cloud/user/AccountDetailVO.java | 4 +-
.../schema/src/com/cloud/user/SSHKeyPairVO.java | 2 -
.../src/com/cloud/user/UserAccountVO.java | 4 +-
.../src/com/cloud/user/UserStatisticsVO.java | 5 +-
.../src/com/cloud/user/UserStatsLogVO.java | 4 +-
.../src/com/cloud/user/dao/AccountDaoImpl.java | 5 +-
.../cloud/user/dao/UserStatisticsDaoImpl.java | 11 +-
.../cloud/user/dao/VmDiskStatisticsDaoImpl.java | 13 +-
.../schema/src/com/cloud/vm/ConsoleProxyVO.java | 186 +-
.../schema/src/com/cloud/vm/DomainRouterVO.java | 4 +-
.../src/com/cloud/vm/InstanceGroupVMMapVO.java | 7 +-
.../src/com/cloud/vm/InstanceGroupVO.java | 4 +-
engine/schema/src/com/cloud/vm/NicVO.java | 11 +-
.../src/com/cloud/vm/SecondaryStorageVmVO.java | 4 +-
engine/schema/src/com/cloud/vm/UserVmVO.java | 4 +-
.../schema/src/com/cloud/vm/VMInstanceVO.java | 1 +
.../com/cloud/vm/dao/ConsoleProxyDaoImpl.java | 42 +-
.../com/cloud/vm/dao/DomainRouterDaoImpl.java | 13 +-
engine/schema/src/com/cloud/vm/dao/NicDao.java | 6 +-
.../src/com/cloud/vm/dao/NicDetailsDaoImpl.java | 3 +-
.../src/com/cloud/vm/dao/NicIpAliasDao.java | 1 +
.../src/com/cloud/vm/dao/NicIpAliasDaoImpl.java | 12 +-
.../src/com/cloud/vm/dao/NicIpAliasVO.java | 23 +-
.../src/com/cloud/vm/dao/NicSecondaryIpDao.java | 1 +
.../src/com/cloud/vm/dao/NicSecondaryIpVO.java | 8 +
.../cloud/vm/dao/SecondaryStorageVmDaoImpl.java | 14 +-
.../cloud/vm/dao/UserVmCloneSettingDaoImpl.java | 2 +-
.../src/com/cloud/vm/dao/UserVmDaoImpl.java | 50 +-
.../schema/src/com/cloud/vm/dao/UserVmData.java | 1 +
.../com/cloud/vm/dao/UserVmDetailsDaoImpl.java | 3 +-
.../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 20 +-
.../src/com/cloud/vm/snapshot/VMSnapshotVO.java | 11 +-
.../affinity/AffinityGroupDomainMapVO.java | 3 +-
.../affinity/AffinityGroupVMMapVO.java | 4 +-
.../affinity/dao/AffinityGroupDao.java | 1 +
.../affinity/dao/AffinityGroupDaoImpl.java | 8 +-
.../dao/AffinityGroupDomainMapDaoImpl.java | 3 +-
.../affinity/dao/AffinityGroupVMMapDaoImpl.java | 1 +
.../cloud/entity/api/db/VMComputeTagVO.java | 1 +
.../engine/cloud/entity/api/db/VMEntityVO.java | 1 +
.../cloud/entity/api/db/VMNetworkMapVO.java | 2 +
.../cloud/entity/api/db/VMReservationVO.java | 1 +
.../cloud/entity/api/db/VMRootDiskTagVO.java | 1 +
.../entity/api/db/VolumeReservationVO.java | 2 +
.../entity/api/db/dao/VMComputeTagDaoImpl.java | 4 +-
.../cloud/entity/api/db/dao/VMEntityDao.java | 10 -
.../entity/api/db/dao/VMEntityDaoImpl.java | 9 +-
.../entity/api/db/dao/VMNetworkMapDaoImpl.java | 6 +-
.../entity/api/db/dao/VMReservationDao.java | 2 -
.../entity/api/db/dao/VMReservationDaoImpl.java | 9 +-
.../entity/api/db/dao/VMRootDiskTagDaoImpl.java | 4 +-
.../api/db/dao/VolumeReservationDaoImpl.java | 6 +-
.../dao/ApplicationLoadBalancerRuleDaoImpl.java | 3 +-
.../apache/cloudstack/region/PortableIpDao.java | 3 -
.../cloudstack/region/PortableIpDaoImpl.java | 18 -
.../cloudstack/region/PortableIpRangeDao.java | 3 -
.../region/PortableIpRangeDaoImpl.java | 18 -
.../cloudstack/region/PortableIpRangeVO.java | 5 -
.../apache/cloudstack/region/PortableIpVO.java | 13 +-
.../apache/cloudstack/region/RegionSyncVO.java | 4 +
.../org/apache/cloudstack/region/RegionVO.java | 4 +
.../cloudstack/region/dao/RegionDaoImpl.java | 3 +-
.../region/gslb/GlobalLoadBalancerDaoImpl.java | 10 +-
.../gslb/GlobalLoadBalancerLbRuleMapDao.java | 4 +-
.../GlobalLoadBalancerLbRuleMapDaoImpl.java | 10 +-
.../gslb/GlobalLoadBalancerLbRuleMapVO.java | 5 +-
.../region/gslb/GlobalLoadBalancerRuleDao.java | 4 +-
.../region/gslb/GlobalLoadBalancerRuleVO.java | 18 +-
.../dao/FirewallRuleDetailsDaoImpl.java | 3 +-
.../dao/RemoteAccessVpnDetailsDaoImpl.java | 3 +-
.../dao/UserIpAddressDetailsDaoImpl.java | 3 +-
.../datastore/db/ImageStoreDetailVO.java | 5 +-
.../storage/datastore/db/ImageStoreVO.java | 6 +
.../datastore/db/PrimaryDataStoreDaoImpl.java | 20 +-
.../datastore/db/SnapshotDataStoreVO.java | 9 +-
.../storage/datastore/db/StoragePoolVO.java | 36 +-
.../storage/datastore/db/VolumeDataStoreVO.java | 4 +-
.../allocator/StorageCacheRandomAllocator.java | 5 +-
.../motion/AncientDataMotionStrategy.java | 6 +-
.../storage/motion/DataMotionServiceImpl.java | 9 +-
.../storage/image/TemplateServiceImpl.java | 33 +-
.../storage/image/store/ImageStoreImpl.java | 3 +-
.../vm/snapshot/dao/VmSnapshotDaoTest.java | 3 +-
.../MockLocalNfsSecondaryStorageResource.java | 20 +-
.../storage/allocator/StorageAllocatorTest.java | 9 +-
.../StorageAllocatorTestConfiguration.java | 9 +-
...StorageCacheReplacementAlgorithmLRUTest.java | 34 +-
.../cloudstack/storage/test/AopTestAdvice.java | 1 -
.../storage/test/ChildTestConfiguration.java | 60 +-
.../storage/test/CloudStackTestNGBase.java | 11 +-
.../test/DirectAgentManagerSimpleImpl.java | 8 +-
.../storage/test/DirectAgentTest.java | 5 +-
.../storage/test/EndpointSelectorTest.java | 13 +-
.../test/FakeDriverTestConfiguration.java | 15 +-
.../storage/test/MockRpcCallBack.java | 3 +-
.../cloudstack/storage/test/S3TemplateTest.java | 24 +-
.../cloudstack/storage/test/SnapshotTest.java | 110 +-
.../storage/test/SnapshotTestWithFakeData.java | 38 +-
.../cloudstack/storage/test/StorageTest.java | 2 +-
.../cloudstack/storage/test/TemplateTest.java | 18 +-
.../cloudstack/storage/test/TestHttp.java | 1 +
.../cloudstack/storage/test/VolumeTest.java | 24 +-
.../storage/test/VolumeTestVmware.java | 22 +-
.../storage/test/volumeServiceTest.java | 18 +-
.../storage/snapshot/SnapshotObject.java | 7 +-
.../storage/snapshot/SnapshotServiceImpl.java | 21 +-
.../snapshot/XenserverSnapshotStrategy.java | 8 +-
.../vmsnapshot/DefaultVMSnapshotStrategy.java | 17 +-
.../test/src/SnapshotDataFactoryTest.java | 3 +-
.../test/src/VMSnapshotStrategyTest.java | 64 +-
.../cloudstack/storage/RemoteHostEndPoint.java | 3 +-
.../allocator/AbstractStoragePoolAllocator.java | 1 -
.../GarbageCollectingStoragePoolAllocator.java | 8 +-
.../allocator/LocalStoragePoolAllocator.java | 10 +-
.../allocator/UseLocalForRootAllocator.java | 1 -
.../allocator/ZoneWideStoragePoolAllocator.java | 8 +-
.../datastore/DataObjectManagerImpl.java | 5 +-
.../datastore/ObjectInDataStoreManagerImpl.java | 10 +-
.../provider/DataStoreProviderManagerImpl.java | 33 +-
.../storage/db/ObjectInDataStoreDaoImpl.java | 5 +-
.../endpoint/DefaultEndPointSelector.java | 5 +-
.../storage/helper/HypervisorHelperImpl.java | 5 +-
.../storage/helper/VMSnapshotHelperImpl.java | 3 +-
.../storage/image/BaseImageStoreDriverImpl.java | 22 +-
.../image/db/ImageStoreDetailsDaoImpl.java | 3 +-
.../image/db/SnapshotDataStoreDaoImpl.java | 2 +-
.../storage/image/format/BAREMETAL.java | 3 +-
.../cloudstack/storage/image/format/OVA.java | 3 +-
.../cloudstack/storage/image/format/QCOW2.java | 3 +-
.../cloudstack/storage/image/format/RAW.java | 3 +-
.../storage/image/format/Unknown.java | 3 +-
.../cloudstack/storage/image/format/VHD.java | 3 +-
.../cloudstack/storage/image/format/VHDX.java | 3 +-
.../volume/TemplateOnPrimaryDataStoreInfo.java | 2 +-
.../datastore/PrimaryDataStoreHelper.java | 7 +-
.../db/PrimaryDataStoreDetailsDaoImpl.java | 3 +-
.../volume/db/TemplatePrimaryDataStoreVO.java | 17 +-
.../api/storage/StrategyPriorityTest.java | 14 +-
.../storage/datastore/PrimaryDataStoreImpl.java | 21 +-
.../PrimaryDataStoreProviderManagerImpl.java | 5 +-
.../datastore/provider/DefaultHostListener.java | 8 +-
.../storage/datastore/type/ISCSI.java | 3 +-
.../datastore/type/NetworkFileSystem.java | 3 +-
.../cloudstack/storage/volume/VolumeObject.java | 13 +-
.../storage/volume/VolumeServiceImpl.java | 51 +-
.../storage/volume/test/ConfiguratorTest.java | 5 +-
.../storage/volume/test/TestConfiguration.java | 4 +-
.../com/cloud/cluster/ClusterManagerImpl.java | 48 +-
.../cluster/ClusterServiceServletAdapter.java | 3 +-
.../cluster/ClusterServiceServletContainer.java | 4 +-
.../cluster/ClusterServiceServletImpl.java | 5 +-
.../cloud/cluster/ManagementServerHostVO.java | 1 +
.../dao/ManagementServerHostDaoImpl.java | 6 +-
.../framework/config/dao/ConfigurationDao.java | 1 -
.../framework/config/impl/ConfigDepotImpl.java | 9 +-
.../config/impl/ConfigDepotAdminTest.java | 2 -
.../utils/crypt/EncryptionSecretKeyChanger.java | 8 +-
.../db/src/com/cloud/utils/db/Attribute.java | 24 +-
.../com/cloud/utils/db/ConnectionConcierge.java | 3 +-
framework/db/src/com/cloud/utils/db/EcInfo.java | 3 +-
.../src/com/cloud/utils/db/GenericDaoBase.java | 3 +-
.../db/src/com/cloud/utils/db/GlobalLock.java | 2 +-
.../db/src/com/cloud/utils/db/Merovingian2.java | 5 +-
.../src/com/cloud/utils/db/SearchCriteria.java | 3 +-
.../db/src/com/cloud/utils/db/SqlGenerator.java | 3 +-
.../src/com/cloud/utils/db/StaticStrategy.java | 7 +-
.../com/cloud/utils/db/TransactionLegacy.java | 74 +-
.../db/test/com/cloud/utils/DbUtilTest.java | 11 +-
.../db/test/com/cloud/utils/db/DbTestDao.java | 3 -
.../cloud/utils/db/ElementCollectionTest.java | 3 +-
.../com/cloud/utils/db/TestTransaction.java | 7 +-
.../utils/db/TransactionContextBuilderTest.java | 1 -
.../com/cloud/utils/db/TransactionTest.java | 5 +-
.../framework/rpc/RpcClientCallImpl.java | 2 -
.../server/ServerTransportProvider.java | 3 +-
.../framework/transport/TransportAddress.java | 2 +-
.../AsyncSampleEventDrivenStyleCaller.java | 11 +-
.../AsyncSampleListenerStyleCaller.java | 2 -
.../codestyle/ClientOnlyEventDrivenStyle.java | 8 +-
.../sampleserver/SampleManagerComponent.java | 33 +-
.../sampleserver/SampleManagerComponent2.java | 5 +-
.../cloudstack/messagebus/TestMessageBus.java | 9 +-
.../jobs/AsyncJobExecutionContext.java | 1 +
.../framework/jobs/dao/AsyncJobDaoImpl.java | 5 +-
.../jobs/dao/AsyncJobJoinMapDaoImpl.java | 3 +-
.../jobs/dao/SyncQueueItemDaoImpl.java | 5 +-
.../framework/jobs/impl/AsyncJobJournalVO.java | 1 -
.../jobs/impl/AsyncJobManagerImpl.java | 51 +-
.../framework/jobs/impl/AsyncJobMonitor.java | 5 +-
.../framework/jobs/impl/SyncQueueItemVO.java | 6 +-
.../jobs/impl/SyncQueueManagerImpl.java | 1 +
.../framework/jobs/impl/SyncQueueVO.java | 7 +-
.../framework/jobs/impl/VmWorkJobVO.java | 2 -
.../managed/context/ManagedContextRunnable.java | 3 +-
.../context/impl/DefaultManagedContext.java | 5 +-
.../managed/threadlocal/ManagedThreadLocal.java | 3 +-
.../context/impl/DefaultManagedContextTest.java | 10 +-
.../spring/lifecycle/AbstractBeanCollector.java | 18 +-
.../lifecycle/CloudStackExtendedLifeCycle.java | 19 +-
.../spring/lifecycle/ConfigDepotLifeCycle.java | 7 +-
.../spring/lifecycle/registry/DumpRegistry.java | 16 +-
.../lifecycle/registry/ExtensionRegistry.java | 57 +-
.../registry/PluggableServiceLifecycle.java | 5 +-
.../lifecycle/registry/RegistryLifecycle.java | 22 +-
.../lifecycle/registry/RegistryUtils.java | 4 +-
.../context/ResourceApplicationContext.java | 3 +-
.../module/factory/CloudStackSpringContext.java | 25 +-
.../factory/ModuleBasedContextFactory.java | 19 +-
.../module/factory/QuietLoaderFactory.java | 4 +-
.../impl/ClasspathModuleDefinitionLocator.java | 12 +-
.../model/impl/DefaultModuleDefinition.java | 34 +-
.../model/impl/DefaultModuleDefinitionSet.java | 65 +-
.../cloudstack/spring/module/util/Main.java | 5 +-
.../web/CloudStackContextLoaderListener.java | 8 +-
.../spring/module/web/ModuleBasedFilter.java | 12 +-
.../factory/ModuleBasedContextFactoryTest.java | 27 +-
...ClasspathModuleDefinitionSetLocatorTest.java | 5 +-
.../model/impl/DefaultModuleDefinitionTest.java | 24 +-
.../acl/StaticRoleBasedAPIAccessChecker.java | 11 +-
.../affinity/ExplicitDedicationProcessor.java | 3 +-
.../affinity/HostAntiAffinityProcessor.java | 13 +-
.../alert/snmp/SnmpEnhancedPatternLayout.java | 6 +-
.../cloudstack/alert/snmp/SnmpHelper.java | 5 +-
.../cloudstack/alert/snmp/SnmpTrapAppender.java | 13 +-
.../snmp/SnmpEnhancedPatternLayoutTest.java | 18 +-
.../alert/snmp/SnmpTrapAppenderTest.java | 12 +-
.../cloudstack/syslog/AlertsSyslogAppender.java | 11 +-
.../syslog/AlertsSyslogAppenderTest.java | 10 +-
.../api/command/user/discovery/ListApisCmd.java | 4 +-
.../api/response/ApiDiscoveryResponse.java | 10 +-
.../api/response/ApiParameterResponse.java | 6 +-
.../api/response/ApiResponseResponse.java | 8 +-
.../discovery/ApiDiscoveryService.java | 5 +-
.../discovery/ApiDiscoveryServiceImpl.java | 8 +-
.../cloudstack/discovery/ApiDiscoveryTest.java | 32 +-
.../admin/ratelimit/ResetApiLimitCmd.java | 8 +-
.../command/user/ratelimit/GetApiLimitCmd.java | 27 +-
.../api/response/ApiLimitResponse.java | 6 +-
.../ratelimit/ApiRateLimitService.java | 1 +
.../ratelimit/ApiRateLimitServiceImpl.java | 3 +-
.../apache/cloudstack/ratelimit/LimitStore.java | 2 -
.../cloudstack/ratelimit/ApiRateLimitTest.java | 16 +-
.../ratelimit/integration/APITest.java | 3 +-
.../ratelimit/integration/LoginResponse.java | 3 +-
.../integration/RateLimitIntegrationTest.java | 8 +-
.../api/commands/DedicateClusterCmd.java | 11 +-
.../api/commands/DedicateHostCmd.java | 11 +-
.../cloudstack/api/commands/DedicatePodCmd.java | 11 +-
.../api/commands/DedicateZoneCmd.java | 11 +-
.../api/commands/ListDedicatedClustersCmd.java | 16 +-
.../api/commands/ListDedicatedHostsCmd.java | 11 +-
.../api/commands/ListDedicatedPodsCmd.java | 11 +-
.../api/commands/ListDedicatedZonesCmd.java | 11 +-
.../commands/ReleaseDedicatedClusterCmd.java | 4 +-
.../api/commands/ReleaseDedicatedHostCmd.java | 4 +-
.../api/commands/ReleaseDedicatedPodCmd.java | 4 +-
.../api/commands/ReleaseDedicatedZoneCmd.java | 4 +-
.../api/response/DedicateClusterResponse.java | 3 +-
.../api/response/DedicateHostResponse.java | 3 +-
.../api/response/DedicatePodResponse.java | 3 +-
.../api/response/DedicateZoneResponse.java | 3 +-
.../dedicated/DedicatedResourceManagerImpl.java | 21 +-
.../cloudstack/dedicated/DedicatedService.java | 11 +-
.../dedicated/manager/DedicatedApiUnitTest.java | 6 +-
.../cloud/deploy/ImplicitDedicationPlanner.java | 6 +-
.../implicitplanner/ImplicitPlannerTest.java | 9 +-
.../deploy/UserConcentratedPodPlanner.java | 4 +-
.../com/cloud/deploy/UserDispersingPlanner.java | 4 +-
.../mom/rabbitmq/RabbitMQEventBus.java | 51 +-
.../api/commands/netapp/AssociateLunCmd.java | 4 +-
.../cloud/api/commands/netapp/CreateLunCmd.java | 7 +-
.../commands/netapp/CreateVolumeOnFilerCmd.java | 7 +-
.../commands/netapp/CreateVolumePoolCmd.java | 7 +-
.../commands/netapp/DeleteVolumePoolCmd.java | 6 +-
.../api/commands/netapp/DestroyLunCmd.java | 7 +-
.../netapp/DestroyVolumeOnFilerCmd.java | 10 +-
.../api/commands/netapp/DissociateLunCmd.java | 11 +-
.../cloud/api/commands/netapp/ListLunsCmd.java | 7 +-
.../api/commands/netapp/ListVolumePoolsCmd.java | 7 +-
.../commands/netapp/ListVolumesOnFilerCmd.java | 11 +-
.../commands/netapp/ModifyVolumePoolCmd.java | 6 +-
.../netapp/src/com/cloud/netapp/LunVO.java | 5 +-
.../netapp/NetappDefaultAllocatorImpl.java | 6 +-
.../src/com/cloud/netapp/NetappManagerImpl.java | 46 +-
.../src/com/cloud/netapp/NetappVolumeVO.java | 5 +-
.../netapp/src/com/cloud/netapp/PoolVO.java | 5 +-
.../netapp/src/com/cloud/netapp/dao/LunDao.java | 2 -
.../src/com/cloud/netapp/dao/LunDaoImpl.java | 2 -
.../database/BaremetalDhcpDaoImpl.java | 4 -
.../baremetal/database/BaremetalDhcpVO.java | 2 -
.../baremetal/database/BaremetalPxeDao.java | 1 -
.../baremetal/database/BaremetalPxeDaoImpl.java | 4 -
.../baremetal/manager/BareMetalDiscoverer.java | 15 +-
.../baremetal/manager/BareMetalPlanner.java | 2 +-
.../manager/BareMetalTemplateAdapter.java | 14 +-
.../baremetal/manager/BaremetalManager.java | 1 -
.../baremetal/manager/BaremetalManagerImpl.java | 14 +-
.../BareMetalPingServiceImpl.java | 12 +-
.../networkservice/BareMetalPxeServiceBase.java | 3 -
.../networkservice/BareMetalResourceBase.java | 8 +-
.../networkservice/BaremetaNetworkGuru.java | 1 +
.../networkservice/BaremetalDhcpElement.java | 14 +-
.../networkservice/BaremetalDhcpManager.java | 3 -
.../BaremetalDhcpManagerImpl.java | 22 +-
.../BaremetalDhcpResourceBase.java | 4 -
.../networkservice/BaremetalDhcpResponse.java | 4 +-
.../networkservice/BaremetalDhcpdResource.java | 9 +-
.../BaremetalDnsmasqResource.java | 5 +-
.../BaremetalKickStartPxeResource.java | 7 +-
.../BaremetalKickStartServiceImpl.java | 20 +-
.../BaremetalPingPxeResource.java | 13 +-
.../networkservice/BaremetalPxeElement.java | 10 +-
.../BaremetalPxeKickStartResponse.java | 3 +-
.../networkservice/BaremetalPxeManagerImpl.java | 4 +-
.../BaremetalPxePingResponse.java | 3 +-
.../networkservice/BaremetalPxeResponse.java | 3 +-
.../BaremetalUserdataElement.java | 19 +-
.../cloudstack/api/AddBaremetalDhcpCmd.java | 17 +-
.../cloudstack/api/AddBaremetalHostCmd.java | 3 -
.../api/AddBaremetalKickStartPxeCmd.java | 5 -
.../cloudstack/api/AddBaremetalPxeCmd.java | 18 +-
.../api/AddBaremetalPxePingServerCmd.java | 4 -
.../cloudstack/api/ListBaremetalDhcpCmd.java | 15 +-
.../api/ListBaremetalPxeServersCmd.java | 9 +-
.../discoverer/HypervServerDiscoverer.java | 170 +-
.../hypervisor/hyperv/guru/HypervGuru.java | 10 +-
.../resource/HypervDirectConnectResource.java | 339 +-
.../test/HypervDirectConnectResourceTest.java | 551 +-
.../kvm/src/com/cloud/ha/KVMInvestigator.java | 12 +-
.../kvm/resource/BridgeVifDriver.java | 6 +-
.../kvm/resource/DirectVifDriver.java | 10 +-
.../hypervisor/kvm/resource/KVMHABase.java | 5 -
.../hypervisor/kvm/resource/KVMHAMonitor.java | 12 +-
.../kvm/resource/LibvirtComputingResource.java | 125 +-
.../kvm/resource/LibvirtDomainXMLParser.java | 4 +-
.../kvm/resource/LibvirtSecretDef.java | 4 +-
.../resource/LibvirtStoragePoolXMLParser.java | 7 +-
.../resource/LibvirtStorageVolumeXMLParser.java | 2 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 4 +-
.../hypervisor/kvm/resource/OvsVifDriver.java | 2 +-
.../hypervisor/kvm/resource/VifDriver.java | 10 +-
.../hypervisor/kvm/resource/VifDriverBase.java | 12 +-
.../hypervisor/kvm/storage/KVMStoragePool.java | 1 +
.../kvm/storage/KVMStoragePoolManager.java | 17 +-
.../kvm/storage/KVMStorageProcessor.java | 48 +-
.../kvm/storage/KVMStorageResource.java | 14 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 60 +-
.../kvm/storage/LibvirtStoragePool.java | 7 +-
.../hypervisor/kvm/storage/StorageAdaptor.java | 1 +
.../kvm/storage/iScsiAdmStorageAdaptor.java | 3 +-
.../apache/cloudstack/utils/qemu/QemuImg.java | 12 +-
.../resource/LibvirtComputingResourceTest.java | 8 +-
.../kvm/resource/LibvirtVMDefTest.java | 10 +-
.../kvm/resource/LibvirtVifDriverTest.java | 16 +-
.../kvm/storage/KVMStorageProcessorTest.java | 6 +-
.../cloudstack/utils/qemu/QemuImgFileTest.java | 5 +-
.../cloudstack/utils/qemu/QemuImgTest.java | 14 +-
.../com/cloud/ovm/hypervisor/OvmDiscoverer.java | 7 +-
.../cloud/ovm/hypervisor/OvmResourceBase.java | 30 +-
.../ovm/src/com/cloud/ovm/object/Coder.java | 3 +-
.../ovm/src/com/cloud/ovm/object/OvmHost.java | 1 -
.../com/cloud/ovm/object/OvmSecurityGroup.java | 4 +-
.../com/cloud/ovm/object/OvmStoragePool.java | 8 +-
.../ovm/src/com/cloud/ovm/object/OvmVm.java | 2 -
.../ovm/src/com/cloud/ovm/object/Test.java | 8 +-
.../cloud/agent/manager/MockAgentManager.java | 11 +-
.../agent/manager/MockAgentManagerImpl.java | 4 +-
.../agent/manager/MockNetworkManagerImpl.java | 7 +-
.../agent/manager/MockStorageManagerImpl.java | 78 +-
.../com/cloud/agent/manager/MockVmManager.java | 6 +-
.../cloud/agent/manager/MockVmManagerImpl.java | 40 +-
.../agent/manager/SimulatorManagerImpl.java | 31 +-
.../api/commands/ConfigureSimulatorCmd.java | 21 +-
.../com/cloud/resource/AgentResourceBase.java | 29 +-
.../cloud/resource/AgentRoutingResource.java | 5 +-
.../cloud/resource/AgentStorageResource.java | 4 +-
.../com/cloud/resource/SimulatorDiscoverer.java | 12 +-
.../resource/SimulatorSecondaryDiscoverer.java | 10 +-
.../resource/SimulatorStorageProcessor.java | 3 +-
.../cloud/simulator/MockConfigurationVO.java | 1 +
.../src/com/cloud/simulator/MockHostVO.java | 20 +
.../cloud/simulator/MockSecurityRulesVO.java | 1 +
.../src/com/cloud/simulator/MockVMVO.java | 16 +
.../simulator/dao/MockConfigurationDaoImpl.java | 18 +-
.../cloud/simulator/dao/MockHostDaoImpl.java | 7 +-
.../simulator/dao/MockSecStorageDaoImpl.java | 7 +-
.../simulator/dao/MockSecurityRulesDaoImpl.java | 14 +-
.../cloud/simulator/dao/MockStoragePoolDao.java | 1 +
.../simulator/dao/MockStoragePoolDaoImpl.java | 7 +-
.../com/cloud/simulator/dao/MockVMDaoImpl.java | 18 +-
.../cloud/simulator/dao/MockVolumeDaoImpl.java | 10 +-
.../SimulatorImageStoreProviderImpl.java | 17 +-
.../src/com/cloud/ucs/database/UcsBladeVO.java | 2 +
.../com/cloud/ucs/database/UcsManagerDao.java | 10 -
.../src/com/cloud/ucs/manager/UcsCommands.java | 64 +-
.../com/cloud/ucs/manager/UcsManagerImpl.java | 5 +-
.../apache/cloudstack/api/AddUcsManagerCmd.java | 15 +-
.../api/AssociateUcsProfileToBladeCmd.java | 13 +-
.../cloudstack/api/DeleteUcsManagerCmd.java | 23 +-
.../apache/cloudstack/api/ListUcsBladeCmd.java | 14 +-
.../cloudstack/api/ListUcsManagerCmd.java | 17 +-
.../cloudstack/api/ListUcsProfileCmd.java | 22 +-
.../api/response/UcsBladeResponse.java | 3 +-
.../api/response/UcsManagerResponse.java | 6 +-
.../api/response/UcsProfileResponse.java | 3 +-
.../api/commands/DeleteCiscoNexusVSMCmd.java | 6 +-
.../api/commands/DisableCiscoNexusVSMCmd.java | 12 +-
.../api/commands/EnableCiscoNexusVSMCmd.java | 14 +-
.../api/commands/ListCiscoNexusVSMsCmd.java | 23 +-
.../api/response/CiscoNexusVSMResponse.java | 5 +-
.../com/cloud/hypervisor/guru/VMwareGuru.java | 28 +-
.../com/cloud/hypervisor/vmware/LegacyZone.java | 1 +
.../hypervisor/vmware/VmwareDatacenter.java | 1 +
.../vmware/VmwareDatacenterZoneMap.java | 1 +
.../vmware/VmwareServerDiscoverer.java | 42 +-
.../vmware/manager/VmwareHostService.java | 3 +-
.../vmware/manager/VmwareManager.java | 5 +-
.../vmware/manager/VmwareManagerImpl.java | 19 +-
.../vmware/manager/VmwareStorageManager.java | 4 +-
.../manager/VmwareStorageManagerImpl.java | 62 +-
.../vmware/resource/VmwareContextFactory.java | 2 +-
.../vmware/resource/VmwareResource.java | 288 +-
.../com/cloud/network/CiscoNexusVSMDevice.java | 1 +
.../network/CiscoNexusVSMDeviceManagerImpl.java | 11 +-
.../cloud/network/CiscoNexusVSMDeviceVO.java | 2 -
.../network/dao/CiscoNexusVSMDeviceDao.java | 1 +
.../network/dao/CiscoNexusVSMDeviceDaoImpl.java | 7 +
.../network/element/CiscoNexusVSMElement.java | 17 +-
.../PremiumSecondaryStorageResource.java | 3 +-
.../VmwareSecondaryStorageContextFactory.java | 2 -
.../VmwareSecondaryStorageResourceHandler.java | 26 +-
.../resource/VmwareStorageLayoutHelper.java | 3 +-
.../resource/VmwareStorageProcessor.java | 93 +-
.../VmwareStorageSubsystemCommandHandler.java | 20 +-
.../api/command/admin/zone/AddVmwareDcCmd.java | 3 +-
.../command/admin/zone/ListVmwareDcsCmd.java | 3 +-
.../command/admin/zone/RemoveVmwareDcCmd.java | 2 +-
.../motion/VmwareStorageMotionStrategy.java | 5 +-
.../vmware/VmwareDatacenterApiUnitTest.java | 18 +-
.../vmware/resource/VmwareResourceTest.java | 21 +-
.../motion/VmwareStorageMotionStrategyTest.java | 40 +-
.../xen/discoverer/XcpServerDiscoverer.java | 24 +-
.../hypervisor/xen/resource/CitrixHelper.java | 4 +-
.../xen/resource/CitrixResourceBase.java | 457 +-
.../hypervisor/xen/resource/XcpOssResource.java | 14 +-
.../xen/resource/XcpServerResource.java | 27 +-
.../xen/resource/XenServer56FP1Resource.java | 21 +-
.../xen/resource/XenServer56Resource.java | 19 +-
.../xen/resource/XenServer56SP2Resource.java | 3 +-
.../xen/resource/XenServer600Resource.java | 2 +-
.../xen/resource/XenServer602Resource.java | 2 +-
.../xen/resource/XenServer610Resource.java | 28 +-
.../xen/resource/XenServer620Resource.java | 2 +-
.../xen/resource/XenServerConnectionPool.java | 15 +-
.../xen/resource/XenServerPoolVms.java | 7 +-
.../xen/resource/XenServerStorageProcessor.java | 114 +-
.../motion/XenServerStorageMotionStrategy.java | 8 +-
.../xen/resource/CitrixResourceBaseTest.java | 42 +-
.../api/commands/AddBigSwitchVnsDeviceCmd.java | 3 +-
.../commands/DeleteBigSwitchVnsDeviceCmd.java | 3 +-
.../commands/ListBigSwitchVnsDevicesCmd.java | 11 +-
.../response/BigSwitchVnsDeviceResponse.java | 4 +-
.../com/cloud/network/BigSwitchVnsDeviceVO.java | 1 +
.../network/element/BigSwitchVnsElement.java | 25 +-
.../guru/BigSwitchVnsGuestNetworkGuru.java | 11 +-
.../network/resource/BigSwitchVnsResource.java | 4 +-
.../network/bigswitch/BigSwitchApiTest.java | 6 +-
.../resource/BigSwitchVnsResourceTest.java | 15 +-
.../commands/AddCiscoAsa1000vResourceCmd.java | 7 +-
.../api/commands/AddCiscoVnmcResourceCmd.java | 7 +-
.../DeleteCiscoAsa1000vResourceCmd.java | 7 +-
.../commands/DeleteCiscoVnmcResourceCmd.java | 13 +-
.../commands/ListCiscoAsa1000vResourcesCmd.java | 6 +-
.../api/commands/ListCiscoVnmcResourcesCmd.java | 6 +-
.../response/CiscoAsa1000vResourceResponse.java | 3 +-
.../api/response/CiscoVnmcResourceResponse.java | 3 +-
.../network/cisco/CiscoAsa1000vDevice.java | 2 +
.../network/cisco/CiscoVnmcConnection.java | 7 +-
.../network/cisco/CiscoVnmcConnectionImpl.java | 18 +-
.../network/cisco/CiscoVnmcController.java | 2 +
.../cloud/network/cisco/NetworkAsa1000vMap.java | 1 +
.../cloud/network/element/CiscoVnmcElement.java | 58 +-
.../network/resource/CiscoVnmcResource.java | 22 +-
.../network/cisco/CiscoVnmcConnectionTest.java | 1 -
.../network/resource/CiscoVnmcResourceTest.java | 22 +-
.../cloudstack/network/element/DnsNotifier.java | 12 +-
.../src/com/cloud/network/ElasticLbVmMapVO.java | 4 +-
.../element/ElasticLoadBalancerElement.java | 12 +-
.../lb/ElasticLoadBalancerManagerImpl.java | 48 +-
.../network/lb/dao/ElasticLbVmMapDaoImpl.java | 9 +-
.../commands/AddExternalLoadBalancerCmd.java | 7 +-
.../api/commands/AddF5LoadBalancerCmd.java | 12 +-
.../commands/ConfigureF5LoadBalancerCmd.java | 10 +-
.../commands/DeleteExternalLoadBalancerCmd.java | 15 +-
.../api/commands/DeleteF5LoadBalancerCmd.java | 8 +-
.../commands/ListExternalLoadBalancersCmd.java | 7 +-
.../commands/ListF5LoadBalancerNetworksCmd.java | 7 +-
.../api/commands/ListF5LoadBalancersCmd.java | 19 +-
.../api/response/F5LoadBalancerResponse.java | 7 +-
.../element/F5ExternalLoadBalancerElement.java | 28 +-
.../F5ExternalLoadBalancerElementService.java | 4 +-
.../cloud/network/resource/F5BigIpResource.java | 11 +-
.../element/InternalLoadBalancerElement.java | 17 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 58 +-
.../InternalLbElementServiceTest.java | 6 +-
.../InternalLbElementTest.java | 5 +-
.../InternalLBVMManagerTest.java | 23 +-
.../InternalLBVMServiceTest.java | 18 +-
.../api/command/CreateServiceInstanceCmd.java | 73 +-
.../api/response/ServiceInstanceResponse.java | 30 +-
.../management/ContrailElementImpl.java | 90 +-
.../contrail/management/ContrailGuru.java | 82 +-
.../contrail/management/ContrailManager.java | 48 +-
.../management/ContrailManagerImpl.java | 166 +-
.../contrail/management/DBSyncGeneric.java | 46 +-
.../network/contrail/management/EventUtils.java | 41 +-
.../management/ManagementNetworkGuru.java | 11 +-
.../contrail/management/ModelDatabase.java | 5 +-
.../contrail/management/ServerDBSync.java | 7 +-
.../contrail/management/ServerDBSyncImpl.java | 233 +-
.../management/ServerEventHandlerImpl.java | 45 +-
.../contrail/management/ServiceManager.java | 5 +-
.../contrail/management/ServiceManagerImpl.java | 85 +-
.../management/ServiceVirtualMachine.java | 8 +-
.../network/contrail/model/FloatingIpModel.java | 22 +-
.../contrail/model/FloatingIpPoolModel.java | 19 +-
.../network/contrail/model/InstanceIpModel.java | 22 +-
.../network/contrail/model/ModelController.java | 13 +-
.../network/contrail/model/ModelObject.java | 10 +-
.../network/contrail/model/ModelObjectBase.java | 15 +-
.../contrail/model/ServiceInstanceModel.java | 56 +-
.../contrail/model/VMInterfaceModel.java | 53 +-
.../contrail/model/VirtualMachineModel.java | 98 +-
.../contrail/model/VirtualNetworkModel.java | 74 +-
.../management/ApiConnectorMockito.java | 37 +-
.../IntegrationTestConfiguration.java | 469 +-
.../management/ManagementServerMock.java | 195 +-
.../contrail/management/MockAccountManager.java | 105 +-
.../management/NetworkProviderTest.java | 113 +-
.../contrail/management/PublicNetworkTest.java | 31 +-
.../contrail/management/TestDbSetup.java | 83 +-
.../management/VirtualNetworkModelTest.java | 24 +-
.../api/commands/AddExternalFirewallCmd.java | 7 +-
.../cloud/api/commands/AddSrxFirewallCmd.java | 9 +-
.../api/commands/ConfigureSrxFirewallCmd.java | 12 +-
.../api/commands/DeleteExternalFirewallCmd.java | 5 +-
.../api/commands/DeleteSrxFirewallCmd.java | 12 +-
.../api/commands/ListExternalFirewallsCmd.java | 9 +-
.../commands/ListSrxFirewallNetworksCmd.java | 10 +-
.../cloud/api/commands/ListSrxFirewallsCmd.java | 12 +-
.../cloud/api/response/SrxFirewallResponse.java | 7 +-
.../JuniperSRXExternalFirewallElement.java | 19 +-
.../JuniperSRXFirewallElementService.java | 4 +-
.../network/resource/JuniperSrxResource.java | 52 +-
.../cloud/network/element/MidoNetElement.java | 159 +-
.../network/element/SimpleFirewallRule.java | 18 +-
.../network/guru/MidoNetGuestNetworkGuru.java | 33 +-
.../network/guru/MidoNetPublicNetworkGuru.java | 14 +-
.../network/resource/MidoNetVifDriver.java | 30 +-
.../network/element/MidoNetElementTest.java | 43 +-
.../commands/AddNetscalerLoadBalancerCmd.java | 35 +-
.../ConfigureNetscalerLoadBalancerCmd.java | 16 +-
.../DeleteNetscalerLoadBalancerCmd.java | 6 +-
.../ListNetscalerLoadBalancerNetworksCmd.java | 11 +-
.../commands/ListNetscalerLoadBalancersCmd.java | 9 +-
.../response/NetscalerLoadBalancerResponse.java | 11 +-
.../src/com/cloud/network/NetScalerPodVO.java | 7 +-
.../cloud/network/element/NetscalerElement.java | 70 +-
.../NetscalerLoadBalancerElementService.java | 1 +
.../network/resource/NetscalerResource.java | 179 +-
.../api/commands/AddNiciraNvpDeviceCmd.java | 3 +-
.../api/commands/DeleteNiciraNvpDeviceCmd.java | 14 +-
.../ListNiciraNvpDeviceNetworksCmd.java | 14 +-
.../api/commands/ListNiciraNvpDevicesCmd.java | 4 +-
.../api/response/NiciraNvpDeviceResponse.java | 8 +-
.../cloud/network/element/NiciraNvpElement.java | 54 +-
.../network/guru/NiciraNvpGuestNetworkGuru.java | 9 +-
.../com/cloud/network/nicira/NiciraNvpApi.java | 14 +-
.../network/resource/NiciraNvpResource.java | 7 +-
.../com/cloud/network/nicira/NatRuleTest.java | 7 +-
.../com/cloud/network/nicira/NiciraTagTest.java | 3 +-
.../network/resource/NiciraNvpResourceTest.java | 2 +-
.../com/cloud/network/element/OvsElement.java | 11 +-
.../cloud/network/guru/OvsGuestNetworkGuru.java | 10 +-
.../cloud/network/ovs/OvsTunnelManagerImpl.java | 8 +-
.../network/ovs/dao/OvsTunnelInterfaceVO.java | 5 +-
.../network/ovs/dao/OvsTunnelNetworkVO.java | 5 +-
.../api/commands/AddExternalFirewallCmd.java | 29 +-
.../api/commands/AddPaloAltoFirewallCmd.java | 31 +-
.../commands/ConfigurePaloAltoFirewallCmd.java | 28 +-
.../api/commands/DeleteExternalFirewallCmd.java | 21 +-
.../api/commands/DeletePaloAltoFirewallCmd.java | 23 +-
.../api/commands/ListExternalFirewallsCmd.java | 19 +-
.../ListPaloAltoFirewallNetworksCmd.java | 26 +-
.../api/commands/ListPaloAltoFirewallsCmd.java | 25 +-
.../api/response/PaloAltoFirewallResponse.java | 57 +-
.../PaloAltoExternalFirewallElement.java | 44 +-
.../element/PaloAltoFirewallElementService.java | 31 +-
.../network/resource/PaloAltoResource.java | 1471 +-
.../cloud/network/utils/HttpClientWrapper.java | 12 +-
.../resource/MockablePaloAltoResource.java | 213 +-
.../network/resource/PaloAltoResourceTest.java | 119 +-
.../cloudstack/api/commands/AddSspCmd.java | 6 +-
.../cloudstack/api/commands/DeleteSspCmd.java | 8 +-
.../cloudstack/api/response/SspResponse.java | 3 +-
.../cloudstack/network/dao/SspUuidDaoImpl.java | 1 +
.../cloudstack/network/element/SspElement.java | 21 +-
.../network/guru/SspGuestNetworkGuru.java | 7 +-
.../network/element/SspClientTest.java | 9 +-
.../network/element/SspElementTest.java | 16 +-
.../network/guru/VxlanGuestNetworkGuru.java | 21 +-
.../network/guru/VxlanGuestNetworkGuruTest.java | 26 +-
.../allocator/RandomStoragePoolAllocator.java | 4 +-
.../driver/CloudStackImageStoreDriverImpl.java | 7 +-
.../CloudStackImageStoreProviderImpl.java | 4 +-
.../driver/S3ImageStoreDriverImpl.java | 14 +-
.../provider/S3ImageStoreProviderImpl.java | 4 +-
.../driver/SampleImageStoreDriverImpl.java | 1 +
.../provider/SwiftImageStoreProviderImpl.java | 4 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 27 +-
...CloudStackPrimaryDataStoreLifeCycleImpl.java | 11 +-
.../SamplePrimaryDataStoreDriverImpl.java | 5 +-
.../driver/SolidfirePrimaryDataStoreDriver.java | 21 +-
.../SolidFirePrimaryDataStoreLifeCycle.java | 2 +-
.../provider/SolidFireHostListener.java | 7 +-
.../SolidfirePrimaryDataStoreProvider.java | 5 +-
.../storage/datastore/util/SolidFireUtil.java | 23 +-
.../storage/test/ChildTestConfiguration.java | 3 +-
.../storage/test/TestConfiguration.java | 5 +-
.../cloudstack/storage/test/VolumeTest.java | 10 +-
.../api/command/LdapCreateAccountCmd.java | 9 +-
.../api/command/LdapDeleteConfigurationCmd.java | 3 +-
.../api/command/LdapImportUsersCmd.java | 35 +-
.../api/command/LdapListConfigurationCmd.java | 3 +-
.../api/command/LdapListUsersCmd.java | 8 +-
.../api/command/LdapUserSearchCmd.java | 3 +-
.../api/response/LdapConfigurationResponse.java | 3 +-
.../api/response/LdapUserResponse.java | 4 +-
.../cloudstack/ldap/LdapConfiguration.java | 2 +-
.../cloudstack/ldap/LdapContextFactory.java | 3 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 13 +-
.../apache/cloudstack/ldap/LdapUserManager.java | 6 +-
.../ldap/dao/LdapConfigurationDaoImpl.java | 3 +-
.../cloud/server/auth/MD5UserAuthenticator.java | 1 +
pom.xml | 2 +-
.../cloud/acl/AffinityGroupAccessChecker.java | 6 +-
server/src/com/cloud/acl/DomainChecker.java | 7 +-
.../allocator/impl/FirstFitAllocator.java | 10 +-
.../impl/FirstFitRoutingAllocator.java | 3 +-
.../allocator/impl/RecreateHostAllocator.java | 10 +-
.../impl/UserConcentratedAllocator.java | 22 +-
.../src/com/cloud/alert/AlertManagerImpl.java | 62 +-
.../cloud/alert/ConsoleProxyAlertAdapter.java | 70 +-
.../alert/SecondaryStorageVmAlertAdapter.java | 96 +-
server/src/com/cloud/api/ApiDBUtils.java | 4 +-
server/src/com/cloud/api/ApiDispatcher.java | 36 +-
server/src/com/cloud/api/ApiGsonHelper.java | 5 +-
.../com/cloud/api/ApiResponseGsonHelper.java | 1 +
server/src/com/cloud/api/ApiResponseHelper.java | 8 +-
server/src/com/cloud/api/ApiServer.java | 91 +-
server/src/com/cloud/api/ApiServerService.java | 4 +-
server/src/com/cloud/api/ApiServlet.java | 28 +-
.../com/cloud/api/EncodedStringTypeAdapter.java | 3 +-
.../cloud/api/ResponseObjectTypeAdapter.java | 9 +-
.../src/com/cloud/api/doc/ApiXmlDocWriter.java | 10 +-
server/src/com/cloud/api/doc/Argument.java | 1 +
.../com/cloud/api/query/QueryManagerImpl.java | 119 +-
.../com/cloud/api/query/ViewResponseHelper.java | 58 +-
.../cloud/api/query/dao/AccountJoinDaoImpl.java | 16 +-
.../api/query/dao/AffinityGroupJoinDao.java | 2 +-
.../api/query/dao/AffinityGroupJoinDaoImpl.java | 4 +-
.../api/query/dao/DataCenterJoinDaoImpl.java | 5 +-
.../api/query/dao/DiskOfferingJoinDao.java | 1 +
.../api/query/dao/DomainRouterJoinDaoImpl.java | 10 +-
.../com/cloud/api/query/dao/HostJoinDao.java | 3 +-
.../cloud/api/query/dao/HostJoinDaoImpl.java | 8 +-
.../cloud/api/query/dao/ImageStoreJoinDao.java | 1 +
.../api/query/dao/ImageStoreJoinDaoImpl.java | 6 +-
.../api/query/dao/InstanceGroupJoinDaoImpl.java | 7 +-
.../query/dao/ProjectAccountJoinDaoImpl.java | 2 +-
.../query/dao/ProjectInvitationJoinDaoImpl.java | 2 +-
.../cloud/api/query/dao/ProjectJoinDaoImpl.java | 6 +-
.../api/query/dao/ResourceTagJoinDaoImpl.java | 5 +-
.../api/query/dao/SecurityGroupJoinDaoImpl.java | 6 +-
.../query/dao/ServiceOfferingJoinDaoImpl.java | 3 +-
.../cloud/api/query/dao/StoragePoolJoinDao.java | 7 +-
.../api/query/dao/StoragePoolJoinDaoImpl.java | 6 +-
.../api/query/dao/TemplateJoinDaoImpl.java | 6 +-
.../api/query/dao/UserAccountJoinDaoImpl.java | 5 +-
.../cloud/api/query/dao/UserVmJoinDaoImpl.java | 9 +-
.../cloud/api/query/dao/VolumeJoinDaoImpl.java | 6 +-
.../api/query/vo/ControlledViewEntity.java | 1 -
.../api/query/vo/ServiceOfferingJoinVO.java | 4 +-
.../com/cloud/api/query/vo/VolumeJoinVO.java | 4 +-
.../api/response/ApiResponseSerializer.java | 38 +-
.../response/EmptyFieldExclusionStrategy.java | 3 +-
.../api/response/SecurityGroupResultObject.java | 9 +-
.../response/SecurityGroupRuleResultObject.java | 3 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 118 +-
.../cloud/capacity/ComputeCapacityListener.java | 3 -
.../cloud/capacity/StorageCapacityListener.java | 12 +-
server/src/com/cloud/configuration/Config.java | 303 +-
.../configuration/ConfigurationManagerImpl.java | 258 +-
.../AgentBasedConsoleProxyManager.java | 3 +-
...AgentBasedStandaloneConsoleProxyManager.java | 5 +-
.../com/cloud/consoleproxy/AgentHookBase.java | 25 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 36 +-
.../src/com/cloud/dc/DedicatedResourceVO.java | 10 +-
.../cloud/dc/dao/DedicatedResourceDaoImpl.java | 3 +-
.../deploy/DeploymentPlanningManagerImpl.java | 116 +-
.../src/com/cloud/deploy/FirstFitPlanner.java | 45 +-
.../cloud/deploy/PlannerHostReservationVO.java | 1 +
.../com/cloud/event/ActionEventInterceptor.java | 7 +-
.../src/com/cloud/event/ActionEventUtils.java | 9 +-
server/src/com/cloud/event/AlertGenerator.java | 32 +-
.../com/cloud/event/dao/EventJoinDaoImpl.java | 8 +-
server/src/com/cloud/ha/HaWorkVO.java | 4 +-
.../ha/HighAvailabilityManagerExtImpl.java | 1 -
.../cloud/ha/HighAvailabilityManagerImpl.java | 45 +-
.../ha/ManagementIPSystemVMInvestigator.java | 3 +-
.../com/cloud/ha/UserVmDomRInvestigator.java | 5 +-
.../cloud/ha/dao/HighAvailabilityDaoImpl.java | 1 -
.../hypervisor/CloudZonesStartupProcessor.java | 7 +-
.../cloud/hypervisor/HypervisorGuruBase.java | 7 +-
.../hypervisor/HypervisorGuruManagerImpl.java | 7 +-
.../kvm/discoverer/KvmDummyResourceBase.java | 5 +-
.../kvm/discoverer/KvmServerDiscoverer.java | 9 +-
.../kvm/discoverer/LibvirtServerDiscoverer.java | 9 +-
.../kvm/discoverer/LxcServerDiscoverer.java | 8 +-
.../com/cloud/keystore/KeystoreManagerImpl.java | 5 +-
.../metadata/ResourceMetaDataManagerImpl.java | 8 +-
.../network/ExternalDeviceUsageManagerImpl.java | 21 +-
.../ExternalFirewallDeviceManagerImpl.java | 50 +-
.../ExternalLoadBalancerDeviceManager.java | 4 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 92 +-
.../ExternalNetworkDeviceManagerImpl.java | 6 +-
.../com/cloud/network/IpAddressManagerImpl.java | 107 +-
.../cloud/network/Ipv6AddressManagerImpl.java | 5 +-
.../src/com/cloud/network/NetworkModelImpl.java | 99 +-
.../com/cloud/network/NetworkServiceImpl.java | 259 +-
.../com/cloud/network/NetworkUsageManager.java | 1 -
.../cloud/network/NetworkUsageManagerImpl.java | 24 +-
.../cloud/network/PortProfileManagerImpl.java | 4 +-
.../network/StorageNetworkManagerImpl.java | 16 +-
.../cloud/network/as/AutoScaleManagerImpl.java | 30 +-
.../element/CloudZonesNetworkElement.java | 8 +-
.../network/element/SecurityGroupElement.java | 11 +-
.../network/element/VirtualRouterElement.java | 113 +-
.../element/VpcVirtualRouterElement.java | 30 +-
.../network/firewall/FirewallManagerImpl.java | 77 +-
.../cloud/network/guru/ControlNetworkGuru.java | 11 +-
.../cloud/network/guru/DirectNetworkGuru.java | 20 +-
.../network/guru/DirectPodBasedNetworkGuru.java | 9 +-
.../network/guru/ExternalGuestNetworkGuru.java | 20 +-
.../cloud/network/guru/GuestNetworkGuru.java | 48 +-
.../cloud/network/guru/PodBasedNetworkGuru.java | 12 +-
.../cloud/network/guru/PrivateNetworkGuru.java | 14 +-
.../cloud/network/guru/PublicNetworkGuru.java | 10 +-
.../cloud/network/guru/StorageNetworkGuru.java | 11 +-
.../network/lb/LBHealthCheckManagerImpl.java | 1 +
.../lb/LoadBalancingRulesManagerImpl.java | 86 +-
.../router/VirtualNetworkApplianceManager.java | 15 +-
.../VirtualNetworkApplianceManagerImpl.java | 496 +-
.../VpcVirtualNetworkApplianceManager.java | 6 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 116 +-
.../cloud/network/rules/RulesManagerImpl.java | 82 +-
.../security/LocalSecurityGroupWorkQueue.java | 1 -
.../network/security/SecurityGroupListener.java | 8 +-
.../security/SecurityGroupManagerImpl.java | 37 +-
.../security/SecurityGroupManagerImpl2.java | 22 +-
.../security/SecurityGroupManagerMBean.java | 2 +-
.../security/SecurityManagerMBeanImpl.java | 1 -
.../network/vpc/NetworkACLManagerImpl.java | 13 +-
.../network/vpc/NetworkACLServiceImpl.java | 28 +-
.../com/cloud/network/vpc/VpcManagerImpl.java | 73 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 34 +-
.../network/vpn/Site2SiteVpnManagerImpl.java | 34 +-
.../com/cloud/projects/ProjectManagerImpl.java | 27 +-
.../com/cloud/resource/ResourceManagerImpl.java | 70 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 59 +-
.../PremiumSecondaryStorageManagerImpl.java | 10 +-
.../cloud/server/ConfigurationServerImpl.java | 170 +-
.../com/cloud/server/ManagementServerImpl.java | 97 +-
server/src/com/cloud/server/StatsCollector.java | 62 +-
.../api/response/BaremetalTemplateResponse.java | 4 +-
.../api/response/NwDeviceDhcpResponse.java | 6 +-
.../api/response/NwDevicePxeServerResponse.java | 6 +-
.../server/api/response/PxePingResponse.java | 4 +-
.../netapp/AssociateLunCmdResponse.java | 4 +-
.../response/netapp/CreateLunCmdResponse.java | 4 +-
.../response/netapp/ListLunsCmdResponse.java | 4 +-
.../netapp/ListVolumePoolsCmdResponse.java | 4 +-
.../netapp/ListVolumesOnFilerCmdResponse.java | 4 +-
.../com/cloud/servlet/CloudStartupServlet.java | 1 -
.../com/cloud/servlet/ConsoleProxyServlet.java | 11 +-
.../cloud/storage/LocalStoragePoolListener.java | 3 +-
server/src/com/cloud/storage/OCFS2Manager.java | 1 -
.../src/com/cloud/storage/OCFS2ManagerImpl.java | 5 +-
.../com/cloud/storage/StorageManagerImpl.java | 69 +-
.../storage/StoragePoolAutomationImpl.java | 2 +-
.../src/com/cloud/storage/TemplateProfile.java | 10 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 35 +-
.../storage/download/DownloadActiveState.java | 3 +-
.../storage/download/DownloadErrorState.java | 3 +-
.../storage/download/DownloadListener.java | 2 +-
.../storage/download/DownloadMonitorImpl.java | 11 +-
.../storage/listener/SnapshotStateListener.java | 24 +-
.../storage/listener/StoragePoolMonitor.java | 10 +-
.../storage/listener/VolumeStateListener.java | 26 +-
.../resource/DummySecondaryStorageResource.java | 11 +-
.../secondary/SecondaryStorageManagerImpl.java | 40 +-
.../SecondaryStorageVmDefaultAllocator.java | 1 -
.../cloud/storage/snapshot/SnapshotManager.java | 7 -
.../storage/snapshot/SnapshotManagerImpl.java | 38 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 12 +-
.../cloud/storage/upload/UploadActiveState.java | 3 -
.../storage/upload/UploadInactiveState.java | 1 -
.../cloud/storage/upload/UploadListener.java | 5 +-
.../com/cloud/storage/upload/UploadMonitor.java | 3 +-
.../cloud/storage/upload/UploadMonitorImpl.java | 25 +-
.../com/cloud/storage/upload/UploadState.java | 1 -
.../cloud/tags/TaggedResourceManagerImpl.java | 8 +-
.../template/HypervisorTemplateAdapter.java | 23 +-
.../src/com/cloud/template/TemplateAdapter.java | 14 +-
.../com/cloud/template/TemplateAdapterBase.java | 49 +-
.../com/cloud/template/TemplateManagerImpl.java | 46 +-
server/src/com/cloud/test/DatabaseConfig.java | 37 +-
server/src/com/cloud/test/IPRangeConfig.java | 7 +-
server/src/com/cloud/test/PodZoneConfig.java | 31 +-
.../src/com/cloud/usage/UsageServiceImpl.java | 11 +-
.../src/com/cloud/user/AccountManagerImpl.java | 43 +-
.../src/com/cloud/user/DomainManagerImpl.java | 29 +-
.../cloud/uuididentity/IdentityServiceImpl.java | 7 +-
.../cloud/uuididentity/dao/IdentityDaoImpl.java | 13 +-
.../src/com/cloud/vm/SystemVmLoadScanner.java | 1 +
server/src/com/cloud/vm/UserVmManager.java | 4 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 335 +-
.../src/com/cloud/vm/UserVmStateListener.java | 46 +-
.../vm/snapshot/VMSnapshotManagerImpl.java | 29 +-
.../affinity/AffinityGroupServiceImpl.java | 31 +-
.../lb/ApplicationLoadBalancerManagerImpl.java | 32 +-
.../cloudstack/network/lb/CertServiceImpl.java | 91 +-
.../apache/cloudstack/region/RegionManager.java | 1 -
.../cloudstack/region/RegionManagerImpl.java | 47 +-
.../cloudstack/region/RegionServiceImpl.java | 31 +-
.../cloudstack/region/RegionsApiUtil.java | 5 +-
.../GlobalLoadBalancingRulesServiceImpl.java | 69 +-
.../region/gslb/GslbServiceProvider.java | 3 +-
server/test/com/cloud/api/APITest.java | 3 +-
.../test/com/cloud/api/ApiDispatcherTest.java | 14 +-
server/test/com/cloud/api/ListPerfTest.java | 7 -
server/test/com/cloud/api/LoginResponse.java | 3 +-
.../com/cloud/capacity/CapacityManagerTest.java | 19 +-
.../configuration/ConfigurationManagerTest.java | 28 +-
.../configuration/ValidateIpRangeTest.java | 26 +-
.../com/cloud/event/EventControlsUnitTest.java | 6 +-
server/test/com/cloud/ha/KVMFencerTest.java | 7 +-
.../test/com/cloud/keystore/KeystoreTest.java | 56 +-
.../cloud/network/CreatePrivateNetworkTest.java | 19 +-
.../network/DedicateGuestVlanRangesTest.java | 2 +-
.../cloud/network/MockFirewallManagerImpl.java | 3 +-
.../network/UpdatePhysicalNetworkTest.java | 32 +-
.../SecurityGroupManagerTestConfiguration.java | 25 +-
.../security/SecurityGroupQueueTest.java | 6 +-
.../cloud/projects/MockProjectManagerImpl.java | 5 -
.../ResourceLimitManagerImplTest.java | 1 +
.../server/ConfigurationServerImplTest.java | 6 +-
.../com/cloud/snapshot/SnapshotDaoTest.java | 6 +-
.../snapshot/SnapshotDaoTestConfiguration.java | 5 +-
.../cloud/storage/dao/StoragePoolDaoTest.java | 5 +-
.../dao/StoragePoolDaoTestConfiguration.java | 5 +-
.../com/cloud/user/MockAccountManagerImpl.java | 10 +-
.../com/cloud/user/MockDomainManagerImpl.java | 4 +-
.../vm/DeploymentPlanningManagerImplTest.java | 114 +-
server/test/com/cloud/vm/UserVmManagerTest.java | 15 +-
.../vm/dao/UserVmCloneSettingDaoImplTest.java | 2 +-
.../UserVmCloneSettingDaoTestConfiguration.java | 3 +-
.../com/cloud/vm/dao/UserVmDaoImplTest.java | 9 +-
.../vm/dao/UserVmDaoTestConfiguration.java | 3 +-
.../vm/snapshot/VMSnapshotManagerTest.java | 16 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 10 +-
.../com/cloud/vpc/MockNetworkManagerImpl.java | 46 +-
.../cloud/vpc/MockSite2SiteVpnManagerImpl.java | 4 +-
.../MockVpcVirtualNetworkApplianceManager.java | 39 +-
.../com/cloud/vpc/NetworkACLManagerTest.java | 18 +-
.../com/cloud/vpc/NetworkACLServiceTest.java | 25 +-
.../com/cloud/vpc/VpcTestConfiguration.java | 37 +-
.../com/cloud/vpc/dao/MockNetworkDaoImpl.java | 11 +-
.../vpc/dao/MockNetworkOfferingDaoImpl.java | 30 +-
.../affinity/AffinityApiUnitTest.java | 30 +-
.../network/lb/ApplicationLoadBalancerTest.java | 38 +-
.../cloudstack/network/lb/CertServiceTest.java | 7 +-
.../networkoffering/ChildTestConfiguration.java | 33 +-
.../CreateNetworkOfferingTest.java | 65 +-
.../privategw/AclOnPrivateGwTest.java | 71 +-
.../cloudstack/region/RegionManagerTest.java | 6 +-
...GlobalLoadBalancingRulesServiceImplTest.java | 34 +-
.../service/ServiceOfferingVOTest.java | 7 +-
.../src/main/java/common/AwtBellAdapter.java | 71 +-
.../src/main/java/common/AwtCanvasAdapter.java | 224 +-
.../main/java/common/AwtClipboardAdapter.java | 51 +-
.../src/main/java/common/AwtKeyEventSource.java | 38 +-
.../main/java/common/AwtMouseEventSource.java | 70 +-
.../src/main/java/common/BitmapOrder.java | 32 +-
.../src/main/java/common/BitmapRectangle.java | 76 +-
.../main/java/common/BufferedImageCanvas.java | 70 +-
.../common/BufferedImageCopyRectAdapter.java | 188 +-
.../java/common/BufferedImagePixelsAdapter.java | 177 +-
.../rdpconsole/src/main/java/common/Client.java | 185 +-
.../src/main/java/common/CopyRectOrder.java | 27 +-
.../src/main/java/common/KeyOrder.java | 29 +-
.../src/main/java/common/MouseOrder.java | 29 +-
.../src/main/java/common/OrderType.java | 2 +-
.../src/main/java/common/ScreenDescription.java | 264 +-
.../main/java/common/SizeChangeListener.java | 2 +-
.../java/rdpclient/AwtRdpKeyboardAdapter.java | 591 +-
.../main/java/rdpclient/AwtRdpMouseAdapter.java | 294 +-
.../java/rdpclient/ClientConfirmActivePDU.java | 1037 +-
.../main/java/rdpclient/ClientFastPathPDU.java | 38 +-
.../src/main/java/rdpclient/ClientInfoPDU.java | 393 +-
.../rdpclient/ClientMCSAttachUserRequest.java | 79 +-
...JoinRequest_ServerMCSChannelConfirmPDUs.java | 166 +-
.../java/rdpclient/ClientMCSConnectInitial.java | 82 +-
.../rdpclient/ClientMCSErectDomainRequest.java | 91 +-
.../java/rdpclient/ClientPacketSniffer.java | 11 +-
.../java/rdpclient/ClientSynchronizePDU.java | 86 +-
.../src/main/java/rdpclient/ClientTpkt.java | 56 +-
.../ClientX224ConnectionRequestPDU.java | 242 +-
.../main/java/rdpclient/ClientX224DataPdu.java | 42 +-
.../src/main/java/rdpclient/HandshakeEnd.java | 6 +-
.../src/main/java/rdpclient/MockServer.java | 223 +-
.../src/main/java/rdpclient/PacketSniffer.java | 70 +-
.../java/rdpclient/RLEBitmapDecompression.java | 1871 ++-
.../src/main/java/rdpclient/RdpClient.java | 230 +-
.../src/main/java/rdpclient/RdpConstants.java | 96 +-
.../src/main/java/rdpclient/RdpState.java | 12 +-
.../main/java/rdpclient/ServerBitmapUpdate.java | 307 +-
.../java/rdpclient/ServerChannel1003Router.java | 985 +-
.../rdpclient/ServerControlPDUCooperate.java | 28 +-
.../ServerControlPDUGrantedControl.java | 28 +-
.../java/rdpclient/ServerDemandActivePDU.java | 737 +-
.../src/main/java/rdpclient/ServerFastPath.java | 391 +-
.../ServerLicenseErrorPDUValidClient.java | 28 +-
.../ServerMCSAttachUserConfirmPDU.java | 155 +-
.../ServerMCSChannelJoinConfirmPDU.java | 32 +-
.../rdpclient/ServerMCSConnectResponse.java | 28 +-
.../src/main/java/rdpclient/ServerMCSPDU.java | 210 +-
.../java/rdpclient/ServerPacketSniffer.java | 14 +-
.../java/rdpclient/ServerPaletteUpdate.java | 73 +-
.../java/rdpclient/ServerSynchronizePDU.java | 28 +-
.../src/main/java/rdpclient/ServerTpkt.java | 66 +-
.../ServerX224ConnectionConfirmPDU.java | 342 +-
.../main/java/rdpclient/ServerX224DataPdu.java | 54 +-
.../rdpclient/TrustAllX509TrustManager.java | 26 +-
.../main/java/rdpclient/UpgradeSocketToSSL.java | 24 +-
.../main/java/streamer/AssertingByteBuffer.java | 138 +-
.../src/main/java/streamer/BaseElement.java | 714 +-
.../src/main/java/streamer/BufferPool.java | 30 +-
.../src/main/java/streamer/ByteBuffer.java | 1593 +-
.../src/main/java/streamer/DataSink.java | 4 +-
.../src/main/java/streamer/DataSource.java | 72 +-
.../src/main/java/streamer/Direction.java | 2 +-
.../src/main/java/streamer/Element.java | 162 +-
.../src/main/java/streamer/Event.java | 19 +-
.../src/main/java/streamer/FakeSink.java | 72 +-
.../src/main/java/streamer/FakeSource.java | 160 +-
.../main/java/streamer/InputStreamSource.java | 280 +-
.../rdpconsole/src/main/java/streamer/Link.java | 68 +-
.../src/main/java/streamer/MockSink.java | 170 +-
.../src/main/java/streamer/MockSource.java | 117 +-
.../src/main/java/streamer/OneTimeSwitch.java | 200 +-
.../src/main/java/streamer/Order.java | 2 +-
.../main/java/streamer/OutputStreamSink.java | 238 +-
.../src/main/java/streamer/Pipeline.java | 118 +-
.../src/main/java/streamer/PipelineImpl.java | 484 +-
.../src/main/java/streamer/Queue.java | 212 +-
.../src/main/java/streamer/SocketWrapper.java | 316 +-
.../src/main/java/streamer/SyncLink.java | 661 +-
.../vncclient/AwtKeyboardEventToVncAdapter.java | 631 +-
.../vncclient/AwtMouseEventToVncAdapter.java | 73 +-
.../main/java/vncclient/EncodingsMessage.java | 52 +-
.../vncclient/FrameBufferUpdateRequest.java | 173 +-
.../vncclient/RGB888LE32PixelFormatRequest.java | 129 +-
.../src/main/java/vncclient/RfbConstants.java | 124 +-
.../src/main/java/vncclient/VncClient.java | 105 +-
.../src/main/java/vncclient/VncInitializer.java | 423 +-
.../main/java/vncclient/VncMessageHandler.java | 695 +-
.../java/vncclient/Vnc_3_3_Authentication.java | 451 +-
.../src/main/java/vncclient/Vnc_3_3_Hello.java | 111 +-
.../src/test/java/rdpclient/MockServerTest.java | 262 +-
.../com/cloud/consoleproxy/ConsoleProxy.java | 17 +-
.../consoleproxy/ConsoleProxyAjaxHandler.java | 7 +-
.../ConsoleProxyAjaxImageHandler.java | 4 +-
.../ConsoleProxyBaseServerFactoryImpl.java | 3 +-
.../consoleproxy/ConsoleProxyClientBase.java | 22 +-
.../consoleproxy/ConsoleProxyCmdHandler.java | 4 +-
.../consoleproxy/ConsoleProxyLoggerFactory.java | 14 +
.../ConsoleProxyResourceHandler.java | 4 +-
.../ConsoleProxySecureServerFactoryImpl.java | 2 +
.../ConsoleProxyThumbnailHandler.java | 4 +-
.../consoleproxy/ConsoleProxyVncClient.java | 9 +-
.../com/cloud/consoleproxy/util/RawHTTP.java | 3 +
.../com/cloud/consoleproxy/vnc/VncClient.java | 1 +
.../consoleproxy/vnc/VncClientPacketSender.java | 9 +-
.../consoleproxy/vnc/VncScreenDescription.java | 9 +-
.../vnc/VncServerPacketReceiver.java | 4 +-
.../packet/server/FramebufferUpdatePacket.java | 6 +-
.../consoleproxy/vnc/packet/server/RawRect.java | 2 +-
.../LocalNfsSecondaryStorageResource.java | 30 +-
.../resource/LocalSecondaryStorageResource.java | 6 +-
.../resource/NfsSecondaryStorageResource.java | 53 +-
.../resource/SecondaryStorageDiscoverer.java | 3 +-
.../storage/template/DownloadManager.java | 10 +-
.../storage/template/DownloadManagerImpl.java | 36 +-
.../storage/template/UploadManagerImpl.java | 17 +-
.../com/cloud/sample/UserCloudAPIExecutor.java | 4 +-
.../cloud/test/longrun/BuildGuestNetwork.java | 4 +-
.../cloud/test/longrun/PerformanceWithAPI.java | 45 +-
test/src/com/cloud/test/longrun/User.java | 54 +-
.../com/cloud/test/longrun/VirtualMachine.java | 37 +-
.../com/cloud/test/longrun/guestNetwork.java | 18 +-
.../com/cloud/test/regression/ApiCommand.java | 69 +-
.../com/cloud/test/regression/ConfigTest.java | 41 +-
.../test/regression/DelegatedAdminTest.java | 37 +-
test/src/com/cloud/test/regression/Deploy.java | 7 +-
.../cloud/test/regression/EventsApiTest.java | 45 +-
test/src/com/cloud/test/regression/HA.java | 15 +-
.../test/regression/LoadBalancingTest.java | 22 +-
.../test/regression/PortForwardingTest.java | 22 +-
.../com/cloud/test/regression/SanityTest.java | 32 +-
test/src/com/cloud/test/regression/Test.java | 6 +-
.../cloud/test/regression/TestCaseEngine.java | 47 +-
.../com/cloud/test/regression/VMApiTest.java | 27 +-
.../test/stress/StressTestDirectAttach.java | 451 +-
.../cloud/test/stress/TestClientWithAPI.java | 108 +-
test/src/com/cloud/test/stress/WgetTest.java | 20 +-
.../cloud/test/ui/AbstractSeleniumTestCase.java | 9 +-
.../src/com/cloud/test/ui/AddAndDeleteAISO.java | 21 +-
.../cloud/test/ui/AddAndDeleteATemplate.java | 24 +-
test/src/com/cloud/test/ui/UIScenarioTest.java | 14 +-
test/src/com/cloud/test/utils/ConsoleProxy.java | 14 +-
.../com/cloud/test/utils/IpSqlGenerator.java | 8 +-
.../src/com/cloud/test/utils/ProxyLoadTemp.java | 24 +-
test/src/com/cloud/test/utils/SignEC2.java | 3 +-
test/src/com/cloud/test/utils/SubmitCert.java | 7 +-
test/src/com/cloud/test/utils/TestClient.java | 11 +-
test/src/com/cloud/test/utils/UtilsForTest.java | 45 +-
.../com/cloud/usage/UsageAlertManagerImpl.java | 30 +-
usage/src/com/cloud/usage/UsageManager.java | 1 -
usage/src/com/cloud/usage/UsageManagerImpl.java | 150 +-
.../src/com/cloud/usage/UsageSanityChecker.java | 43 +-
.../usage/parser/IPAddressUsageParser.java | 17 +-
.../usage/parser/LoadBalancerUsageParser.java | 13 +-
.../parser/NetworkOfferingUsageParser.java | 16 +-
.../cloud/usage/parser/NetworkUsageParser.java | 20 +-
.../usage/parser/PortForwardingUsageParser.java | 13 +-
.../usage/parser/SecurityGroupUsageParser.java | 13 +-
.../cloud/usage/parser/StorageUsageParser.java | 17 +-
.../src/com/cloud/usage/parser/UsageParser.java | 4 +-
.../usage/parser/VMInstanceUsageParser.java | 13 +-
.../usage/parser/VMSnapshotUsageParser.java | 15 +-
.../cloud/usage/parser/VPNUserUsageParser.java | 15 +-
.../cloud/usage/parser/VmDiskUsageParser.java | 29 +-
.../cloud/usage/parser/VolumeUsageParser.java | 19 +-
.../test/com/cloud/usage/UsageManagerTest.java | 47 +-
.../usage/UsageManagerTestConfiguration.java | 57 +-
utils/src/com/cloud/utils/IteratorUtil.java | 6 +
utils/src/com/cloud/utils/MethodCapturer.java | 3 +-
.../src/com/cloud/utils/PasswordGenerator.java | 4 +-
utils/src/com/cloud/utils/Profiler.java | 1 +
utils/src/com/cloud/utils/PropertiesUtil.java | 2 +-
utils/src/com/cloud/utils/S3Utils.java | 18 +-
utils/src/com/cloud/utils/SwiftUtil.java | 24 +-
utils/src/com/cloud/utils/UriUtils.java | 6 +-
.../utils/cisco/n1kv/vsm/NetconfHelper.java | 16 +-
.../cloud/utils/cisco/n1kv/vsm/VsmCommand.java | 1 +
.../utils/cisco/n1kv/vsm/VsmOkResponse.java | 1 +
.../cisco/n1kv/vsm/VsmPolicyMapResponse.java | 2 +-
.../cisco/n1kv/vsm/VsmPortProfileResponse.java | 9 +-
.../cloud/utils/cisco/n1kv/vsm/VsmResponse.java | 12 +-
.../utils/component/ComponentNamingPolicy.java | 3 +
.../cloud/utils/component/PluggableService.java | 1 -
.../com/cloud/utils/encoding/URLEncoder.java | 6 +-
.../com/cloud/utils/events/SubscriptionMgr.java | 4 +-
.../utils/exception/ExecutionException.java | 1 -
utils/src/com/cloud/utils/fsm/StateMachine.java | 2 +-
.../src/com/cloud/utils/fsm/StateMachine2.java | 2 +-
utils/src/com/cloud/utils/mgmt/JmxUtil.java | 3 +-
.../utils/mgmt/PropertyMapDynamicBean.java | 2 +-
utils/src/com/cloud/utils/net/MacAddress.java | 4 +-
utils/src/com/cloud/utils/net/NetUtils.java | 2 +-
.../com/cloud/utils/nio/TrustAllManager.java | 3 +
utils/src/com/cloud/utils/script/Script.java | 1 +
utils/src/com/cloud/utils/script/Script2.java | 1 +
.../src/com/cloud/utils/ssh/SSHKeysHelper.java | 4 +-
utils/src/com/cloud/utils/ssh/SshHelper.java | 13 +-
.../cloud/utils/storage/encoding/Decoder.java | 10 +-
.../ssl/EasySSLProtocolSocketFactory.java | 10 +-
utils/test/com/cloud/utils/NumbersUtilTest.java | 8 +-
utils/test/com/cloud/utils/ReflectUtilTest.java | 12 +-
utils/test/com/cloud/utils/ScriptTest.java | 5 +-
utils/test/com/cloud/utils/StringUtilsTest.java | 4 +-
.../com/cloud/utils/crypto/RSAHelperTest.java | 27 +-
.../utils/exception/ExceptionUtilTest.java | 2 +-
.../test/com/cloud/utils/net/NetUtilsTest.java | 3 +-
.../com/cloud/utils/ssh/SSHKeysHelperTest.java | 52 +-
.../utils/testcase/Log4jEnabledTestCase.java | 5 +-
.../test/com/cloud/utils/testcase/NioTest.java | 16 +-
.../cloud/utils/xmlobject/TestXmlObject.java | 4 -
.../cloud/utils/xmlobject/TestXmlObject2.java | 9 +-
.../com/cloud/hypervisor/vmware/mo/BaseMO.java | 3 +-
.../cloud/hypervisor/vmware/mo/ClusterMO.java | 31 +-
.../vmware/mo/CustomFieldsManagerMO.java | 4 +-
.../hypervisor/vmware/mo/DatacenterMO.java | 12 +-
.../cloud/hypervisor/vmware/mo/DatastoreMO.java | 8 +-
.../vmware/mo/DistributedVirtualSwitchMO.java | 3 +-
.../vmware/mo/HostDatastoreBrowserMO.java | 3 +-
.../vmware/mo/HostDatastoreSystemMO.java | 3 +-
.../vmware/mo/HostFirewallSystemMO.java | 3 +-
.../com/cloud/hypervisor/vmware/mo/HostMO.java | 69 +-
.../vmware/mo/HostNetworkSystemMO.java | 3 +-
.../vmware/mo/HostStorageSystemMO.java | 4 +-
.../hypervisor/vmware/mo/HttpNfcLeaseMO.java | 8 +-
.../vmware/mo/HypervisorHostHelper.java | 48 +-
.../cloud/hypervisor/vmware/mo/NetworkMO.java | 3 +-
.../hypervisor/vmware/mo/PerfManagerMO.java | 7 +-
.../vmware/mo/SnapshotDescriptor.java | 5 +-
.../com/cloud/hypervisor/vmware/mo/TaskMO.java | 3 +-
.../vmware/mo/VirtualDiskManagerMO.java | 7 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 44 +-
.../vmware/mo/VmwareHypervisorHost.java | 5 +-
.../hypervisor/vmware/util/VmwareClient.java | 5 +-
.../hypervisor/vmware/util/VmwareContext.java | 64 +-
.../vmware/util/VmwareContextPool.java | 8 +-
.../hypervisor/vmware/util/VmwareHelper.java | 12 +-
.../vmware/mo/TestVmwareContextFactory.java | 2 +-
.../hypervisor/vmware/mo/VmwareMOTest.java | 2 -
3156 files changed, 43769 insertions(+), 36087 deletions(-)
----------------------------------------------------------------------
[34/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskTypeChoice_type0.java
index b584041..56f7795 100644
--- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskTypeChoice_type0.java
@@ -126,7 +126,8 @@ public class CreateInstanceExportTaskTypeChoice_type0 implements org.apache.axis
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -159,9 +160,8 @@ public class CreateInstanceExportTaskTypeChoice_type0 implements org.apache.axis
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateInternetGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInternetGateway.java b/awsapi/src/com/amazon/ec2/CreateInternetGateway.java
index 1bd2ea6..3035ed5 100644
--- a/awsapi/src/com/amazon/ec2/CreateInternetGateway.java
+++ b/awsapi/src/com/amazon/ec2/CreateInternetGateway.java
@@ -98,7 +98,8 @@ public class CreateInternetGateway implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateInternetGateway implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateInternetGateway implements org.apache.axis2.databinding.ADBBe
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateInternetGateway").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateInternetGateway").equals(reader.getName())) {
object.setCreateInternetGateway(com.amazon.ec2.CreateInternetGatewayType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponse.java b/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponse.java
index 51d3d6b..0bf3fec 100644
--- a/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class CreateInternetGatewayResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateInternetGatewayResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateInternetGatewayResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class CreateInternetGatewayResponse implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class CreateInternetGatewayResponse implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponseType.java b/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponseType.java
index b565db5..f10e7d8 100644
--- a/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponseType.java
@@ -125,7 +125,8 @@ public class CreateInternetGatewayResponseType implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class CreateInternetGatewayResponseType implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateInternetGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateInternetGatewayType.java b/awsapi/src/com/amazon/ec2/CreateInternetGatewayType.java
index 8feedd0..cac97b6 100644
--- a/awsapi/src/com/amazon/ec2/CreateInternetGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/CreateInternetGatewayType.java
@@ -77,7 +77,8 @@ public class CreateInternetGatewayType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -126,9 +127,8 @@ public class CreateInternetGatewayType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateKeyPair.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateKeyPair.java b/awsapi/src/com/amazon/ec2/CreateKeyPair.java
index 9764413..f276110 100644
--- a/awsapi/src/com/amazon/ec2/CreateKeyPair.java
+++ b/awsapi/src/com/amazon/ec2/CreateKeyPair.java
@@ -98,7 +98,8 @@ public class CreateKeyPair implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateKeyPair implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateKeyPair implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateKeyPair").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateKeyPair").equals(reader.getName())) {
object.setCreateKeyPair(com.amazon.ec2.CreateKeyPairType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java b/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java
index 7481fa0..e35b801 100644
--- a/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java
@@ -98,7 +98,8 @@ public class CreateKeyPairResponse implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateKeyPairResponse implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateKeyPairResponse implements org.apache.axis2.databinding.ADBBe
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateKeyPairResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateKeyPairResponse").equals(reader.getName())) {
object.setCreateKeyPairResponse(com.amazon.ec2.CreateKeyPairResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java b/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java
index 3f9f95e..5275429 100644
--- a/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java
@@ -173,7 +173,8 @@ public class CreateKeyPairResponseType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -350,9 +351,8 @@ public class CreateKeyPairResponseType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateKeyPairType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateKeyPairType.java b/awsapi/src/com/amazon/ec2/CreateKeyPairType.java
index b32dc3d..7cbc8a3 100644
--- a/awsapi/src/com/amazon/ec2/CreateKeyPairType.java
+++ b/awsapi/src/com/amazon/ec2/CreateKeyPairType.java
@@ -101,7 +101,8 @@ public class CreateKeyPairType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class CreateKeyPairType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateNetworkAcl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAcl.java b/awsapi/src/com/amazon/ec2/CreateNetworkAcl.java
index 5bf934b..5b2b5e8 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAcl.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAcl.java
@@ -98,7 +98,8 @@ public class CreateNetworkAcl implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateNetworkAcl implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateNetworkAcl implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkAcl").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkAcl").equals(reader.getName())) {
object.setCreateNetworkAcl(com.amazon.ec2.CreateNetworkAclType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntry.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntry.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntry.java
index 31259ec..cb84a69 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntry.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntry.java
@@ -98,7 +98,8 @@ public class CreateNetworkAclEntry implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateNetworkAclEntry implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateNetworkAclEntry implements org.apache.axis2.databinding.ADBBe
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkAclEntry").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkAclEntry").equals(reader.getName())) {
object.setCreateNetworkAclEntry(com.amazon.ec2.CreateNetworkAclEntryType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponse.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponse.java
index ff78385..1b325d1 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class CreateNetworkAclEntryResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkAclEntryResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkAclEntryResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class CreateNetworkAclEntryResponse implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class CreateNetworkAclEntryResponse implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponseType.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponseType.java
index 31cb07e..815c44c 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponseType.java
@@ -125,7 +125,8 @@ public class CreateNetworkAclEntryResponseType implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class CreateNetworkAclEntryResponseType implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryType.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryType.java
index 57d67e0..b98823d 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryType.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryType.java
@@ -297,7 +297,8 @@ public class CreateNetworkAclEntryType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -543,9 +544,8 @@ public class CreateNetworkAclEntryType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateNetworkAclResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclResponse.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclResponse.java
index f443e5d..a80bf81 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclResponse.java
@@ -98,7 +98,8 @@ public class CreateNetworkAclResponse implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateNetworkAclResponse implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateNetworkAclResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclResponseType.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclResponseType.java
index 8c210f1..0dcac84 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclResponseType.java
@@ -125,7 +125,8 @@ public class CreateNetworkAclResponseType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class CreateNetworkAclResponseType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateNetworkAclType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclType.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclType.java
index 25f0c12..2bb15c2 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclType.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclType.java
@@ -101,7 +101,8 @@ public class CreateNetworkAclType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class CreateNetworkAclType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateNetworkInterface.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkInterface.java b/awsapi/src/com/amazon/ec2/CreateNetworkInterface.java
index 1d53034..0e3449a 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkInterface.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkInterface.java
@@ -98,7 +98,8 @@ public class CreateNetworkInterface implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateNetworkInterface implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateNetworkInterface implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkInterface").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkInterface").equals(reader.getName())) {
object.setCreateNetworkInterface(com.amazon.ec2.CreateNetworkInterfaceType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponse.java b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponse.java
index 613860f..8445541 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class CreateNetworkInterfaceResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkInterfaceResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkInterfaceResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class CreateNetworkInterfaceResponse implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class CreateNetworkInterfaceResponse implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponseType.java b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponseType.java
index d83d25a..70a7162 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponseType.java
@@ -125,7 +125,8 @@ public class CreateNetworkInterfaceResponseType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class CreateNetworkInterfaceResponseType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceType.java b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceType.java
index 5cb8077..784181f 100644
--- a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceType.java
+++ b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceType.java
@@ -292,7 +292,8 @@ public class CreateNetworkInterfaceType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -480,9 +481,8 @@ public class CreateNetworkInterfaceType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -795,7 +795,8 @@ public class CreateNetworkInterfaceType implements org.apache.axis2.databinding.
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) {
object.setPrivateIpAddressesSet(com.amazon.ec2.PrivateIpAddressesSetRequestType.Factory.parse(reader));
@@ -810,7 +811,8 @@ public class CreateNetworkInterfaceType implements org.apache.axis2.databinding.
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "secondaryPrivateIpAddressCount").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "secondaryPrivateIpAddressCount").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java b/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java
index 8b0e1a3..404fec2 100644
--- a/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java
+++ b/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java
@@ -98,7 +98,8 @@ public class CreatePlacementGroup implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreatePlacementGroup implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreatePlacementGroup implements org.apache.axis2.databinding.ADBBea
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreatePlacementGroup").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreatePlacementGroup").equals(reader.getName())) {
object.setCreatePlacementGroup(com.amazon.ec2.CreatePlacementGroupType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java b/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java
index 3b62b3b..19e8964 100644
--- a/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class CreatePlacementGroupResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreatePlacementGroupResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreatePlacementGroupResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class CreatePlacementGroupResponse implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class CreatePlacementGroupResponse implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java b/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java
index 8b613f3..86c5b43 100644
--- a/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java
@@ -125,7 +125,8 @@ public class CreatePlacementGroupResponseType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class CreatePlacementGroupResponseType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java b/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java
index 0bb8cfe..7cfc46e 100644
--- a/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java
+++ b/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java
@@ -125,7 +125,8 @@ public class CreatePlacementGroupType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class CreatePlacementGroupType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListing.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListing.java b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListing.java
index 0bb0fbe..d2d441c 100644
--- a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListing.java
+++ b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListing.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class CreateReservedInstancesListing implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateReservedInstancesListing", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateReservedInstancesListing",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class CreateReservedInstancesListing implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class CreateReservedInstancesListing implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponse.java b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponse.java
index 71b6320..2a69f8b 100644
--- a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponse.java
@@ -30,8 +30,8 @@ package com.amazon.ec2;
public class CreateReservedInstancesListingResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateReservedInstancesListingResponse",
- "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "CreateReservedInstancesListingResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -99,7 +99,8 @@ public class CreateReservedInstancesListingResponse implements org.apache.axis2.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -119,9 +120,8 @@ public class CreateReservedInstancesListingResponse implements org.apache.axis2.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponseType.java b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponseType.java
index fd2f770..862e6df 100644
--- a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponseType.java
@@ -125,7 +125,8 @@ public class CreateReservedInstancesListingResponseType implements org.apache.ax
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -202,7 +203,8 @@ public class CreateReservedInstancesListingResponseType implements org.apache.ax
if (localReservedInstancesListingsSet == null) {
throw new org.apache.axis2.databinding.ADBException("reservedInstancesListingsSet cannot be null!!");
}
- localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet"), factory, xmlWriter);
+ localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet"), factory,
+ xmlWriter);
xmlWriter.writeEndElement();
@@ -211,9 +213,8 @@ public class CreateReservedInstancesListingResponseType implements org.apache.ax
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -445,7 +446,8 @@ public class CreateReservedInstancesListingResponseType implements org.apache.ax
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet").equals(reader.getName())) {
object.setReservedInstancesListingsSet(com.amazon.ec2.DescribeReservedInstancesListingsResponseSetType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingType.java b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingType.java
index 1181fab..d7304c5 100644
--- a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingType.java
+++ b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingType.java
@@ -188,7 +188,8 @@ public class CreateReservedInstancesListingType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -335,9 +336,8 @@ public class CreateReservedInstancesListingType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateRoute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRoute.java b/awsapi/src/com/amazon/ec2/CreateRoute.java
index 5d24a2b..72810cb 100644
--- a/awsapi/src/com/amazon/ec2/CreateRoute.java
+++ b/awsapi/src/com/amazon/ec2/CreateRoute.java
@@ -98,7 +98,8 @@ public class CreateRoute implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateRoute implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateRouteResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteResponse.java b/awsapi/src/com/amazon/ec2/CreateRouteResponse.java
index 5781692..8564fa6 100644
--- a/awsapi/src/com/amazon/ec2/CreateRouteResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateRouteResponse.java
@@ -98,7 +98,8 @@ public class CreateRouteResponse implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateRouteResponse implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateRouteResponse implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateRouteResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateRouteResponse").equals(reader.getName())) {
object.setCreateRouteResponse(com.amazon.ec2.CreateRouteResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateRouteResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteResponseType.java b/awsapi/src/com/amazon/ec2/CreateRouteResponseType.java
index 3b99be4..035ff90 100644
--- a/awsapi/src/com/amazon/ec2/CreateRouteResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateRouteResponseType.java
@@ -125,7 +125,8 @@ public class CreateRouteResponseType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class CreateRouteResponseType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateRouteTable.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTable.java b/awsapi/src/com/amazon/ec2/CreateRouteTable.java
index 0132ce6..8ecb753 100644
--- a/awsapi/src/com/amazon/ec2/CreateRouteTable.java
+++ b/awsapi/src/com/amazon/ec2/CreateRouteTable.java
@@ -98,7 +98,8 @@ public class CreateRouteTable implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateRouteTable implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class CreateRouteTable implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateRouteTable").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateRouteTable").equals(reader.getName())) {
object.setCreateRouteTable(com.amazon.ec2.CreateRouteTableType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateRouteTableResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTableResponse.java b/awsapi/src/com/amazon/ec2/CreateRouteTableResponse.java
index 24c1638..bead6e8 100644
--- a/awsapi/src/com/amazon/ec2/CreateRouteTableResponse.java
+++ b/awsapi/src/com/amazon/ec2/CreateRouteTableResponse.java
@@ -98,7 +98,8 @@ public class CreateRouteTableResponse implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class CreateRouteTableResponse implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateRouteTableResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTableResponseType.java b/awsapi/src/com/amazon/ec2/CreateRouteTableResponseType.java
index a757933..f08261f 100644
--- a/awsapi/src/com/amazon/ec2/CreateRouteTableResponseType.java
+++ b/awsapi/src/com/amazon/ec2/CreateRouteTableResponseType.java
@@ -125,7 +125,8 @@ public class CreateRouteTableResponseType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class CreateRouteTableResponseType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateRouteTableType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTableType.java b/awsapi/src/com/amazon/ec2/CreateRouteTableType.java
index 44f4451..3ac0769 100644
--- a/awsapi/src/com/amazon/ec2/CreateRouteTableType.java
+++ b/awsapi/src/com/amazon/ec2/CreateRouteTableType.java
@@ -101,7 +101,8 @@ public class CreateRouteTableType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class CreateRouteTableType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateRouteType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteType.java b/awsapi/src/com/amazon/ec2/CreateRouteType.java
index 75fb200..2e3f7e0 100644
--- a/awsapi/src/com/amazon/ec2/CreateRouteType.java
+++ b/awsapi/src/com/amazon/ec2/CreateRouteType.java
@@ -149,7 +149,8 @@ public class CreateRouteType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -267,9 +268,8 @@ public class CreateRouteType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/CreateRouteTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/CreateRouteTypeChoice_type0.java
index c079a47..beb9245 100644
--- a/awsapi/src/com/amazon/ec2/CreateRouteTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/CreateRouteTypeChoice_type0.java
@@ -210,7 +210,8 @@ public class CreateRouteTypeChoice_type0 implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -336,9 +337,8 @@ public class CreateRouteTypeChoice_type0 implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
[30/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVpcType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpcType.java b/awsapi/src/com/amazon/ec2/DeleteVpcType.java
index 9c53c82..a6e7ab8 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpcType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpcType.java
@@ -101,7 +101,8 @@ public class DeleteVpcType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DeleteVpcType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVpnConnection.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnection.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnection.java
index d81443c..933ab4e 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnection.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnection.java
@@ -98,7 +98,8 @@ public class DeleteVpnConnection implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteVpnConnection implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeleteVpnConnection implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnConnection").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnConnection").equals(reader.getName())) {
object.setDeleteVpnConnection(com.amazon.ec2.DeleteVpnConnectionType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponse.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponse.java
index f0c3dbf..96dca99 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DeleteVpnConnectionResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnConnectionResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnConnectionResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DeleteVpnConnectionResponse implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DeleteVpnConnectionResponse implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponseType.java
index 2ecd42c..c99375c 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponseType.java
@@ -125,7 +125,8 @@ public class DeleteVpnConnectionResponseType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeleteVpnConnectionResponseType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRoute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRoute.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRoute.java
index 76570bd..18511a8 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRoute.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRoute.java
@@ -98,7 +98,8 @@ public class DeleteVpnConnectionRoute implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteVpnConnectionRoute implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponse.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponse.java
index 335af6b..d1199ef 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DeleteVpnConnectionRouteResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnConnectionRouteResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "DeleteVpnConnectionRouteResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DeleteVpnConnectionRouteResponse implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DeleteVpnConnectionRouteResponse implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponseType.java
index 5e788d6..fd07a5e 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponseType.java
@@ -125,7 +125,8 @@ public class DeleteVpnConnectionRouteResponseType implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeleteVpnConnectionRouteResponseType implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteType.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteType.java
index 6c9aa21..4c214c2 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteType.java
@@ -125,7 +125,8 @@ public class DeleteVpnConnectionRouteType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class DeleteVpnConnectionRouteType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionType.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionType.java
index a54daae..fea593f 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionType.java
@@ -101,7 +101,8 @@ public class DeleteVpnConnectionType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DeleteVpnConnectionType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVpnGateway.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnGateway.java b/awsapi/src/com/amazon/ec2/DeleteVpnGateway.java
index d457a92..6025380 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnGateway.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnGateway.java
@@ -98,7 +98,8 @@ public class DeleteVpnGateway implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteVpnGateway implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeleteVpnGateway implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnGateway").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnGateway").equals(reader.getName())) {
object.setDeleteVpnGateway(com.amazon.ec2.DeleteVpnGatewayType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponse.java b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponse.java
index bfe61fa..15990ec 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponse.java
@@ -98,7 +98,8 @@ public class DeleteVpnGatewayResponse implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeleteVpnGatewayResponse implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponseType.java
index 9058ea0..e5722ed 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponseType.java
@@ -125,7 +125,8 @@ public class DeleteVpnGatewayResponseType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeleteVpnGatewayResponseType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java
index 865d7b6..c599936 100644
--- a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java
@@ -101,7 +101,8 @@ public class DeleteVpnGatewayType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DeleteVpnGatewayType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeregisterImage.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeregisterImage.java b/awsapi/src/com/amazon/ec2/DeregisterImage.java
index d7c1ca4..3b0b5d1 100644
--- a/awsapi/src/com/amazon/ec2/DeregisterImage.java
+++ b/awsapi/src/com/amazon/ec2/DeregisterImage.java
@@ -98,7 +98,8 @@ public class DeregisterImage implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeregisterImage implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DeregisterImage implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeregisterImage").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeregisterImage").equals(reader.getName())) {
object.setDeregisterImage(com.amazon.ec2.DeregisterImageType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeregisterImageResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeregisterImageResponse.java b/awsapi/src/com/amazon/ec2/DeregisterImageResponse.java
index a74ca34..ddcf635 100644
--- a/awsapi/src/com/amazon/ec2/DeregisterImageResponse.java
+++ b/awsapi/src/com/amazon/ec2/DeregisterImageResponse.java
@@ -98,7 +98,8 @@ public class DeregisterImageResponse implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DeregisterImageResponse implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeregisterImageResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeregisterImageResponseType.java b/awsapi/src/com/amazon/ec2/DeregisterImageResponseType.java
index 6205f38..dd8cf96 100644
--- a/awsapi/src/com/amazon/ec2/DeregisterImageResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DeregisterImageResponseType.java
@@ -125,7 +125,8 @@ public class DeregisterImageResponseType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class DeregisterImageResponseType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DeregisterImageType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DeregisterImageType.java b/awsapi/src/com/amazon/ec2/DeregisterImageType.java
index c220ce0..b091dfd 100644
--- a/awsapi/src/com/amazon/ec2/DeregisterImageType.java
+++ b/awsapi/src/com/amazon/ec2/DeregisterImageType.java
@@ -101,7 +101,8 @@ public class DeregisterImageType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DeregisterImageType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeAddresses.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddresses.java b/awsapi/src/com/amazon/ec2/DescribeAddresses.java
index 52d0f7f..68a8838 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddresses.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddresses.java
@@ -98,7 +98,8 @@ public class DescribeAddresses implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeAddresses implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeAddresses implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAddresses").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAddresses").equals(reader.getName())) {
object.setDescribeAddresses(com.amazon.ec2.DescribeAddressesType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeAddressesInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesInfoType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesInfoType.java
index d75ee3c..cc23cab 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesInfoType.java
@@ -142,7 +142,8 @@ public class DescribeAddressesInfoType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeAddressesInfoType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeAddressesItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesItemType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesItemType.java
index 83d722b..ee00ce2 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesItemType.java
@@ -101,7 +101,8 @@ public class DescribeAddressesItemType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DescribeAddressesItemType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeAddressesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesResponse.java b/awsapi/src/com/amazon/ec2/DescribeAddressesResponse.java
index f9023cd..0a4db62 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeAddressesResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAddressesResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME =
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAddressesResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeAddressesResponse implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeAddressesResponse implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseInfoType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseInfoType.java
index e9a7721..0c80415 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseInfoType.java
@@ -142,7 +142,8 @@ public class DescribeAddressesResponseInfoType implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeAddressesResponseInfoType implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseItemType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseItemType.java
index 6c4a15b..380a403 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseItemType.java
@@ -353,7 +353,8 @@ public class DescribeAddressesResponseItemType implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -662,9 +663,8 @@ public class DescribeAddressesResponseItemType implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -1036,7 +1036,8 @@ public class DescribeAddressesResponseItemType implements org.apache.axis2.datab
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceOwnerId").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceOwnerId").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseType.java
index 83c56c1..c03ac5a 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseType.java
@@ -125,7 +125,8 @@ public class DescribeAddressesResponseType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeAddressesResponseType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeAddressesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesType.java
index 181c9d5..d85f8ce 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAddressesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAddressesType.java
@@ -163,7 +163,8 @@ public class DescribeAddressesType implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -227,9 +228,8 @@ public class DescribeAddressesType implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZones.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZones.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZones.java
index 6f1394c..de546e9 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZones.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZones.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeAvailabilityZones implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAvailabilityZones", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME =
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAvailabilityZones", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeAvailabilityZones implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeAvailabilityZones implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponse.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponse.java
index caadbd9..5901a32 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeAvailabilityZonesResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAvailabilityZonesResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "DescribeAvailabilityZonesResponse", "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeAvailabilityZonesResponse implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeAvailabilityZonesResponse implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponseType.java
index 7b45c53..b82270a 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponseType.java
@@ -125,7 +125,8 @@ public class DescribeAvailabilityZonesResponseType implements org.apache.axis2.d
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeAvailabilityZonesResponseType implements org.apache.axis2.d
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetItemType.java
index 56a9e5e..df7aa71 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetItemType.java
@@ -101,7 +101,8 @@ public class DescribeAvailabilityZonesSetItemType implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DescribeAvailabilityZonesSetItemType implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetType.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetType.java
index 1a72b10..ca436af 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetType.java
@@ -142,7 +142,8 @@ public class DescribeAvailabilityZonesSetType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeAvailabilityZonesSetType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesType.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesType.java
index 4b7cdbe..5460b30 100644
--- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesType.java
@@ -139,7 +139,8 @@ public class DescribeAvailabilityZonesType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -198,9 +199,8 @@ public class DescribeAvailabilityZonesType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeBundleTasks.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasks.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasks.java
index 27f326a..71de750 100644
--- a/awsapi/src/com/amazon/ec2/DescribeBundleTasks.java
+++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasks.java
@@ -98,7 +98,8 @@ public class DescribeBundleTasks implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeBundleTasks implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class DescribeBundleTasks implements org.apache.axis2.databinding.ADBBean
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeBundleTasks").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeBundleTasks").equals(reader.getName())) {
object.setDescribeBundleTasks(com.amazon.ec2.DescribeBundleTasksType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeBundleTasksInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksInfoType.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksInfoType.java
index 67aff16..1261173 100644
--- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksInfoType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksInfoType.java
@@ -142,7 +142,8 @@ public class DescribeBundleTasksInfoType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class DescribeBundleTasksInfoType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeBundleTasksItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksItemType.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksItemType.java
index c8e0755..86f5799 100644
--- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksItemType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksItemType.java
@@ -101,7 +101,8 @@ public class DescribeBundleTasksItemType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class DescribeBundleTasksItemType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponse.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponse.java
index a1e8a29..111bb0a 100644
--- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeBundleTasksResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeBundleTasksResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeBundleTasksResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeBundleTasksResponse implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeBundleTasksResponse implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponseType.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponseType.java
index 8d1727a..d9f45b3 100644
--- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponseType.java
@@ -125,7 +125,8 @@ public class DescribeBundleTasksResponseType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeBundleTasksResponseType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -445,7 +445,8 @@ public class DescribeBundleTasksResponseType implements org.apache.axis2.databin
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "bundleInstanceTasksSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "bundleInstanceTasksSet").equals(reader.getName())) {
object.setBundleInstanceTasksSet(com.amazon.ec2.BundleInstanceTasksSetType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeBundleTasksType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksType.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksType.java
index 84791e9..f150e87 100644
--- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksType.java
@@ -139,7 +139,8 @@ public class DescribeBundleTasksType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -198,9 +199,8 @@ public class DescribeBundleTasksType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeConversionTasks.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeConversionTasks.java b/awsapi/src/com/amazon/ec2/DescribeConversionTasks.java
index 519d91c..453c2e1 100644
--- a/awsapi/src/com/amazon/ec2/DescribeConversionTasks.java
+++ b/awsapi/src/com/amazon/ec2/DescribeConversionTasks.java
@@ -98,7 +98,8 @@ public class DescribeConversionTasks implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class DescribeConversionTasks implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponse.java b/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponse.java
index ddcbd17..b4001ce 100644
--- a/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponse.java
+++ b/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class DescribeConversionTasksResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeConversionTasksResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeConversionTasksResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class DescribeConversionTasksResponse implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class DescribeConversionTasksResponse implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponseType.java b/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponseType.java
index a5ce146..1677331 100644
--- a/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponseType.java
+++ b/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponseType.java
@@ -125,7 +125,8 @@ public class DescribeConversionTasksResponseType implements org.apache.axis2.dat
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class DescribeConversionTasksResponseType implements org.apache.axis2.dat
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
[22/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ImportInstanceResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceResponse.java b/awsapi/src/com/amazon/ec2/ImportInstanceResponse.java
index a312c61..a019fae 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstanceResponse.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstanceResponse.java
@@ -98,7 +98,8 @@ public class ImportInstanceResponse implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ImportInstanceResponse implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class ImportInstanceResponse implements org.apache.axis2.databinding.ADBB
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportInstanceResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportInstanceResponse").equals(reader.getName())) {
object.setImportInstanceResponse(com.amazon.ec2.ImportInstanceResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ImportInstanceResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceResponseType.java b/awsapi/src/com/amazon/ec2/ImportInstanceResponseType.java
index 615508b..d7ff071 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstanceResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstanceResponseType.java
@@ -125,7 +125,8 @@ public class ImportInstanceResponseType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class ImportInstanceResponseType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ImportInstanceTaskDetailsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceTaskDetailsType.java b/awsapi/src/com/amazon/ec2/ImportInstanceTaskDetailsType.java
index 2603ea9..2f2e459 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstanceTaskDetailsType.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstanceTaskDetailsType.java
@@ -215,7 +215,8 @@ public class ImportInstanceTaskDetailsType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -367,9 +368,8 @@ public class ImportInstanceTaskDetailsType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ImportInstanceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceType.java b/awsapi/src/com/amazon/ec2/ImportInstanceType.java
index c0b1c0f..2a1d213 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstanceType.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstanceType.java
@@ -226,7 +226,8 @@ public class ImportInstanceType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -378,9 +379,8 @@ public class ImportInstanceType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailItemType.java b/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailItemType.java
index 4a8e60a..b49440a 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailItemType.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailItemType.java
@@ -273,7 +273,8 @@ public class ImportInstanceVolumeDetailItemType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -489,9 +490,8 @@ public class ImportInstanceVolumeDetailItemType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailSetType.java b/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailSetType.java
index b2471e6..c74ca1b 100644
--- a/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailSetType.java
+++ b/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailSetType.java
@@ -142,7 +142,8 @@ public class ImportInstanceVolumeDetailSetType implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class ImportInstanceVolumeDetailSetType implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ImportKeyPair.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportKeyPair.java b/awsapi/src/com/amazon/ec2/ImportKeyPair.java
index 02102d8..5bf062d 100644
--- a/awsapi/src/com/amazon/ec2/ImportKeyPair.java
+++ b/awsapi/src/com/amazon/ec2/ImportKeyPair.java
@@ -98,7 +98,8 @@ public class ImportKeyPair implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ImportKeyPair implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class ImportKeyPair implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportKeyPair").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportKeyPair").equals(reader.getName())) {
object.setImportKeyPair(com.amazon.ec2.ImportKeyPairType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ImportKeyPairResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportKeyPairResponse.java b/awsapi/src/com/amazon/ec2/ImportKeyPairResponse.java
index 49796fd..d65d0e6 100644
--- a/awsapi/src/com/amazon/ec2/ImportKeyPairResponse.java
+++ b/awsapi/src/com/amazon/ec2/ImportKeyPairResponse.java
@@ -98,7 +98,8 @@ public class ImportKeyPairResponse implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ImportKeyPairResponse implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class ImportKeyPairResponse implements org.apache.axis2.databinding.ADBBe
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportKeyPairResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportKeyPairResponse").equals(reader.getName())) {
object.setImportKeyPairResponse(com.amazon.ec2.ImportKeyPairResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ImportKeyPairResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportKeyPairResponseType.java b/awsapi/src/com/amazon/ec2/ImportKeyPairResponseType.java
index a0f0412..ff92699 100644
--- a/awsapi/src/com/amazon/ec2/ImportKeyPairResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ImportKeyPairResponseType.java
@@ -149,7 +149,8 @@ public class ImportKeyPairResponseType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -294,9 +295,8 @@ public class ImportKeyPairResponseType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ImportKeyPairType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportKeyPairType.java b/awsapi/src/com/amazon/ec2/ImportKeyPairType.java
index b502928..16680ce 100644
--- a/awsapi/src/com/amazon/ec2/ImportKeyPairType.java
+++ b/awsapi/src/com/amazon/ec2/ImportKeyPairType.java
@@ -125,7 +125,8 @@ public class ImportKeyPairType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class ImportKeyPairType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ImportVolume.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportVolume.java b/awsapi/src/com/amazon/ec2/ImportVolume.java
index faa8919..3226225 100644
--- a/awsapi/src/com/amazon/ec2/ImportVolume.java
+++ b/awsapi/src/com/amazon/ec2/ImportVolume.java
@@ -98,7 +98,8 @@ public class ImportVolume implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ImportVolume implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ImportVolumeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportVolumeResponse.java b/awsapi/src/com/amazon/ec2/ImportVolumeResponse.java
index f478220..68d2b9d 100644
--- a/awsapi/src/com/amazon/ec2/ImportVolumeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ImportVolumeResponse.java
@@ -98,7 +98,8 @@ public class ImportVolumeResponse implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ImportVolumeResponse implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class ImportVolumeResponse implements org.apache.axis2.databinding.ADBBea
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportVolumeResponse").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportVolumeResponse").equals(reader.getName())) {
object.setImportVolumeResponse(com.amazon.ec2.ImportVolumeResponseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ImportVolumeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportVolumeResponseType.java b/awsapi/src/com/amazon/ec2/ImportVolumeResponseType.java
index 54df28a..2b9d9fd 100644
--- a/awsapi/src/com/amazon/ec2/ImportVolumeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ImportVolumeResponseType.java
@@ -125,7 +125,8 @@ public class ImportVolumeResponseType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class ImportVolumeResponseType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ImportVolumeTaskDetailsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportVolumeTaskDetailsType.java b/awsapi/src/com/amazon/ec2/ImportVolumeTaskDetailsType.java
index 60a04cd..61fcc67 100644
--- a/awsapi/src/com/amazon/ec2/ImportVolumeTaskDetailsType.java
+++ b/awsapi/src/com/amazon/ec2/ImportVolumeTaskDetailsType.java
@@ -211,7 +211,8 @@ public class ImportVolumeTaskDetailsType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -363,9 +364,8 @@ public class ImportVolumeTaskDetailsType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ImportVolumeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ImportVolumeType.java b/awsapi/src/com/amazon/ec2/ImportVolumeType.java
index 219a03e..4ec5c67 100644
--- a/awsapi/src/com/amazon/ec2/ImportVolumeType.java
+++ b/awsapi/src/com/amazon/ec2/ImportVolumeType.java
@@ -187,7 +187,8 @@ public class ImportVolumeType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -310,9 +311,8 @@ public class ImportVolumeType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemType.java b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemType.java
index 360c16a..a019054 100644
--- a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemType.java
@@ -125,7 +125,8 @@ public class InstanceBlockDeviceMappingItemType implements org.apache.axis2.data
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class InstanceBlockDeviceMappingItemType implements org.apache.axis2.data
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemTypeChoice_type0.java
index 04902b0..2f6e971 100644
--- a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemTypeChoice_type0.java
@@ -210,7 +210,8 @@ public class InstanceBlockDeviceMappingItemTypeChoice_type0 implements org.apach
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -282,9 +283,8 @@ public class InstanceBlockDeviceMappingItemTypeChoice_type0 implements org.apach
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemType.java b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemType.java
index c53a366..ad2339d 100644
--- a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemType.java
@@ -125,7 +125,8 @@ public class InstanceBlockDeviceMappingResponseItemType implements org.apache.ax
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class InstanceBlockDeviceMappingResponseItemType implements org.apache.ax
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemTypeChoice_type0.java
index c56ea48..b3511d3 100644
--- a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemTypeChoice_type0.java
@@ -126,7 +126,8 @@ public class InstanceBlockDeviceMappingResponseItemTypeChoice_type0 implements o
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -141,7 +142,8 @@ public class InstanceBlockDeviceMappingResponseItemTypeChoice_type0 implements o
java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/");
if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) {
- writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":InstanceBlockDeviceMappingResponseItemTypeChoice_type0", xmlWriter);
+ writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":InstanceBlockDeviceMappingResponseItemTypeChoice_type0",
+ xmlWriter);
} else {
writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "InstanceBlockDeviceMappingResponseItemTypeChoice_type0", xmlWriter);
}
@@ -159,9 +161,8 @@ public class InstanceBlockDeviceMappingResponseItemTypeChoice_type0 implements o
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseType.java b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseType.java
index 917ec28..78c18b2 100644
--- a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseType.java
@@ -103,7 +103,8 @@ public class InstanceBlockDeviceMappingResponseType implements org.apache.axis2.
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem);
list.add(param);
- this.localItem = (com.amazon.ec2.InstanceBlockDeviceMappingResponseItemType[])list.toArray(new com.amazon.ec2.InstanceBlockDeviceMappingResponseItemType[list.size()]);
+ this.localItem =
+ (com.amazon.ec2.InstanceBlockDeviceMappingResponseItemType[])list.toArray(new com.amazon.ec2.InstanceBlockDeviceMappingResponseItemType[list.size()]);
}
@@ -142,7 +143,8 @@ public class InstanceBlockDeviceMappingResponseType implements org.apache.axis2.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +210,8 @@ public class InstanceBlockDeviceMappingResponseType implements org.apache.axis2.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingType.java b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingType.java
index e559c03..4af8d60 100644
--- a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingType.java
@@ -142,7 +142,8 @@ public class InstanceBlockDeviceMappingType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class InstanceBlockDeviceMappingType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceCountsSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceCountsSetItemType.java b/awsapi/src/com/amazon/ec2/InstanceCountsSetItemType.java
index 233a7ff..a2b5505 100644
--- a/awsapi/src/com/amazon/ec2/InstanceCountsSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceCountsSetItemType.java
@@ -125,7 +125,8 @@ public class InstanceCountsSetItemType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class InstanceCountsSetItemType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceCountsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceCountsSetType.java b/awsapi/src/com/amazon/ec2/InstanceCountsSetType.java
index fc8763b..7aa0ecf 100644
--- a/awsapi/src/com/amazon/ec2/InstanceCountsSetType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceCountsSetType.java
@@ -129,7 +129,8 @@ public class InstanceCountsSetType implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -195,9 +196,8 @@ public class InstanceCountsSetType implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceEbsBlockDeviceType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceEbsBlockDeviceType.java b/awsapi/src/com/amazon/ec2/InstanceEbsBlockDeviceType.java
index bb01c85..029bcf2 100644
--- a/awsapi/src/com/amazon/ec2/InstanceEbsBlockDeviceType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceEbsBlockDeviceType.java
@@ -140,7 +140,8 @@ public class InstanceEbsBlockDeviceType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -250,9 +251,8 @@ public class InstanceEbsBlockDeviceType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceExportTaskResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceExportTaskResponseType.java b/awsapi/src/com/amazon/ec2/InstanceExportTaskResponseType.java
index 7fc0e54..54cf7b9 100644
--- a/awsapi/src/com/amazon/ec2/InstanceExportTaskResponseType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceExportTaskResponseType.java
@@ -139,7 +139,8 @@ public class InstanceExportTaskResponseType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -252,9 +253,8 @@ public class InstanceExportTaskResponseType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceIdSetType.java b/awsapi/src/com/amazon/ec2/InstanceIdSetType.java
index 194e367..6431bbb 100644
--- a/awsapi/src/com/amazon/ec2/InstanceIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceIdSetType.java
@@ -142,7 +142,8 @@ public class InstanceIdSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class InstanceIdSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,7 +463,8 @@ public class InstanceIdSetType implements org.apache.axis2.databinding.ADBBean {
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.InstanceIdType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.InstanceIdType.class, list1));
+ object.setItem((com.amazon.ec2.InstanceIdType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.InstanceIdType.class,
+ list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceIdType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceIdType.java b/awsapi/src/com/amazon/ec2/InstanceIdType.java
index c635f5e..47470c9 100644
--- a/awsapi/src/com/amazon/ec2/InstanceIdType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceIdType.java
@@ -101,7 +101,8 @@ public class InstanceIdType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class InstanceIdType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceLicenseRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceLicenseRequestType.java b/awsapi/src/com/amazon/ec2/InstanceLicenseRequestType.java
index d182181..0ecb4d4 100644
--- a/awsapi/src/com/amazon/ec2/InstanceLicenseRequestType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceLicenseRequestType.java
@@ -101,7 +101,8 @@ public class InstanceLicenseRequestType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class InstanceLicenseRequestType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceLicenseResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceLicenseResponseType.java b/awsapi/src/com/amazon/ec2/InstanceLicenseResponseType.java
index a8c25a5..41cc0cf 100644
--- a/awsapi/src/com/amazon/ec2/InstanceLicenseResponseType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceLicenseResponseType.java
@@ -101,7 +101,8 @@ public class InstanceLicenseResponseType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class InstanceLicenseResponseType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceMonitoringStateType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceMonitoringStateType.java b/awsapi/src/com/amazon/ec2/InstanceMonitoringStateType.java
index 9074554..ba4b090 100644
--- a/awsapi/src/com/amazon/ec2/InstanceMonitoringStateType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceMonitoringStateType.java
@@ -101,7 +101,8 @@ public class InstanceMonitoringStateType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class InstanceMonitoringStateType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAssociationType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAssociationType.java b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAssociationType.java
index 470866b..52b0f9b 100644
--- a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAssociationType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAssociationType.java
@@ -139,7 +139,8 @@ public class InstanceNetworkInterfaceAssociationType implements org.apache.axis2
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -252,9 +253,8 @@ public class InstanceNetworkInterfaceAssociationType implements org.apache.axis2
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAttachmentType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAttachmentType.java b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAttachmentType.java
index ad12418..ae5d755 100644
--- a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAttachmentType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAttachmentType.java
@@ -197,7 +197,8 @@ public class InstanceNetworkInterfaceAttachmentType implements org.apache.axis2.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -400,9 +401,8 @@ public class InstanceNetworkInterfaceAttachmentType implements org.apache.axis2.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemRequestType.java b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemRequestType.java
index a485c03..c21a90d 100644
--- a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemRequestType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemRequestType.java
@@ -407,7 +407,8 @@ public class InstanceNetworkInterfaceSetItemRequestType implements org.apache.ax
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -687,9 +688,8 @@ public class InstanceNetworkInterfaceSetItemRequestType implements org.apache.ax
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -1072,7 +1072,8 @@ public class InstanceNetworkInterfaceSetItemRequestType implements org.apache.ax
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) {
object.setPrivateIpAddressesSet(com.amazon.ec2.PrivateIpAddressesSetRequestType.Factory.parse(reader));
@@ -1087,7 +1088,8 @@ public class InstanceNetworkInterfaceSetItemRequestType implements org.apache.ax
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "secondaryPrivateIpAddressCount").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "secondaryPrivateIpAddressCount").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemType.java b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemType.java
index 6b9d8a4..e0bfa3a 100644
--- a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemType.java
@@ -516,7 +516,8 @@ public class InstanceNetworkInterfaceSetItemType implements org.apache.axis2.dat
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -876,9 +877,8 @@ public class InstanceNetworkInterfaceSetItemType implements org.apache.axis2.dat
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -1382,7 +1382,8 @@ public class InstanceNetworkInterfaceSetItemType implements org.apache.axis2.dat
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) {
object.setPrivateIpAddressesSet(com.amazon.ec2.InstancePrivateIpAddressesSetType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetRequestType.java b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetRequestType.java
index 720826f..59738e0 100644
--- a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetRequestType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetRequestType.java
@@ -103,7 +103,8 @@ public class InstanceNetworkInterfaceSetRequestType implements org.apache.axis2.
java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem);
list.add(param);
- this.localItem = (com.amazon.ec2.InstanceNetworkInterfaceSetItemRequestType[])list.toArray(new com.amazon.ec2.InstanceNetworkInterfaceSetItemRequestType[list.size()]);
+ this.localItem =
+ (com.amazon.ec2.InstanceNetworkInterfaceSetItemRequestType[])list.toArray(new com.amazon.ec2.InstanceNetworkInterfaceSetItemRequestType[list.size()]);
}
@@ -142,7 +143,8 @@ public class InstanceNetworkInterfaceSetRequestType implements org.apache.axis2.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +210,8 @@ public class InstanceNetworkInterfaceSetRequestType implements org.apache.axis2.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetType.java b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetType.java
index 95b93f1..8489608 100644
--- a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetType.java
@@ -142,7 +142,8 @@ public class InstanceNetworkInterfaceSetType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class InstanceNetworkInterfaceSetType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstancePlacementType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstancePlacementType.java b/awsapi/src/com/amazon/ec2/InstancePlacementType.java
index e444bb7..c7a898b 100644
--- a/awsapi/src/com/amazon/ec2/InstancePlacementType.java
+++ b/awsapi/src/com/amazon/ec2/InstancePlacementType.java
@@ -153,7 +153,8 @@ public class InstancePlacementType implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -267,9 +268,8 @@ public class InstancePlacementType implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetItemType.java b/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetItemType.java
index 54d7dbd..b5c5941 100644
--- a/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetItemType.java
@@ -192,7 +192,8 @@ public class InstancePrivateIpAddressesSetItemType implements org.apache.axis2.d
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -309,9 +310,8 @@ public class InstancePrivateIpAddressesSetItemType implements org.apache.axis2.d
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetType.java b/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetType.java
index d908e3e..0955393 100644
--- a/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetType.java
+++ b/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetType.java
@@ -142,7 +142,8 @@ public class InstancePrivateIpAddressesSetType implements org.apache.axis2.datab
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class InstancePrivateIpAddressesSetType implements org.apache.axis2.datab
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceStateChangeSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStateChangeSetType.java b/awsapi/src/com/amazon/ec2/InstanceStateChangeSetType.java
index 97606b0..4ebb42c 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStateChangeSetType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStateChangeSetType.java
@@ -142,7 +142,8 @@ public class InstanceStateChangeSetType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class InstanceStateChangeSetType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceStateChangeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStateChangeType.java b/awsapi/src/com/amazon/ec2/InstanceStateChangeType.java
index e14835b..d6af118 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStateChangeType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStateChangeType.java
@@ -149,7 +149,8 @@ public class InstanceStateChangeType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -240,9 +241,8 @@ public class InstanceStateChangeType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
[15/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/UnmonitorInstancesResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/UnmonitorInstancesResponse.java b/awsapi/src/com/amazon/ec2/UnmonitorInstancesResponse.java
index 47d681e..f27b1ed 100644
--- a/awsapi/src/com/amazon/ec2/UnmonitorInstancesResponse.java
+++ b/awsapi/src/com/amazon/ec2/UnmonitorInstancesResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class UnmonitorInstancesResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnmonitorInstancesResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnmonitorInstancesResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class UnmonitorInstancesResponse implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class UnmonitorInstancesResponse implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/UserDataType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/UserDataType.java b/awsapi/src/com/amazon/ec2/UserDataType.java
index c456f9a..4b04afd 100644
--- a/awsapi/src/com/amazon/ec2/UserDataType.java
+++ b/awsapi/src/com/amazon/ec2/UserDataType.java
@@ -165,7 +165,8 @@ public class UserDataType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -266,9 +267,8 @@ public class UserDataType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -482,7 +482,7 @@ public class UserDataType implements org.apache.axis2.databinding.ADBBean {
// handle attribute "version"
java.lang.String tempAttribVersion =
- reader.getAttributeValue(null, "version");
+ reader.getAttributeValue(null, "version");
if (tempAttribVersion != null) {
java.lang.String content = tempAttribVersion;
@@ -499,7 +499,7 @@ public class UserDataType implements org.apache.axis2.databinding.ADBBean {
// handle attribute "encoding"
java.lang.String tempAttribEncoding =
- reader.getAttributeValue(null, "encoding");
+ reader.getAttributeValue(null, "encoding");
if (tempAttribEncoding != null) {
java.lang.String content = tempAttribEncoding;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/UserIdGroupPairSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/UserIdGroupPairSetType.java b/awsapi/src/com/amazon/ec2/UserIdGroupPairSetType.java
index b754e0a..ec36b2b 100644
--- a/awsapi/src/com/amazon/ec2/UserIdGroupPairSetType.java
+++ b/awsapi/src/com/amazon/ec2/UserIdGroupPairSetType.java
@@ -142,7 +142,8 @@ public class UserIdGroupPairSetType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class UserIdGroupPairSetType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,8 +463,8 @@ public class UserIdGroupPairSetType implements org.apache.axis2.databinding.ADBB
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.UserIdGroupPairType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.UserIdGroupPairType.class,
- list1));
+ object.setItem((com.amazon.ec2.UserIdGroupPairType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+ com.amazon.ec2.UserIdGroupPairType.class, list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/UserIdGroupPairType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/UserIdGroupPairType.java b/awsapi/src/com/amazon/ec2/UserIdGroupPairType.java
index cc1ff97..2ee5645 100644
--- a/awsapi/src/com/amazon/ec2/UserIdGroupPairType.java
+++ b/awsapi/src/com/amazon/ec2/UserIdGroupPairType.java
@@ -191,7 +191,8 @@ public class UserIdGroupPairType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -338,9 +339,8 @@ public class UserIdGroupPairType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ValueSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ValueSetType.java b/awsapi/src/com/amazon/ec2/ValueSetType.java
index 8276320..1f5a47a 100644
--- a/awsapi/src/com/amazon/ec2/ValueSetType.java
+++ b/awsapi/src/com/amazon/ec2/ValueSetType.java
@@ -142,7 +142,8 @@ public class ValueSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class ValueSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ValueType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ValueType.java b/awsapi/src/com/amazon/ec2/ValueType.java
index 27854a6..dbdc99c 100644
--- a/awsapi/src/com/amazon/ec2/ValueType.java
+++ b/awsapi/src/com/amazon/ec2/ValueType.java
@@ -101,7 +101,8 @@ public class ValueType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class ValueType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VgwTelemetryType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VgwTelemetryType.java b/awsapi/src/com/amazon/ec2/VgwTelemetryType.java
index 5805e5b..56371ea 100644
--- a/awsapi/src/com/amazon/ec2/VgwTelemetryType.java
+++ b/awsapi/src/com/amazon/ec2/VgwTelemetryType.java
@@ -142,7 +142,8 @@ public class VgwTelemetryType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class VgwTelemetryType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VolumeStatusActionItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusActionItemType.java b/awsapi/src/com/amazon/ec2/VolumeStatusActionItemType.java
index 00885de..8bc6e53 100644
--- a/awsapi/src/com/amazon/ec2/VolumeStatusActionItemType.java
+++ b/awsapi/src/com/amazon/ec2/VolumeStatusActionItemType.java
@@ -173,7 +173,8 @@ public class VolumeStatusActionItemType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -350,9 +351,8 @@ public class VolumeStatusActionItemType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VolumeStatusActionsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusActionsSetType.java b/awsapi/src/com/amazon/ec2/VolumeStatusActionsSetType.java
index 465d609..e49e66c 100644
--- a/awsapi/src/com/amazon/ec2/VolumeStatusActionsSetType.java
+++ b/awsapi/src/com/amazon/ec2/VolumeStatusActionsSetType.java
@@ -142,7 +142,8 @@ public class VolumeStatusActionsSetType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class VolumeStatusActionsSetType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VolumeStatusDetailsItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusDetailsItemType.java b/awsapi/src/com/amazon/ec2/VolumeStatusDetailsItemType.java
index 7a6148d..5e7f100 100644
--- a/awsapi/src/com/amazon/ec2/VolumeStatusDetailsItemType.java
+++ b/awsapi/src/com/amazon/ec2/VolumeStatusDetailsItemType.java
@@ -125,7 +125,8 @@ public class VolumeStatusDetailsItemType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class VolumeStatusDetailsItemType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VolumeStatusDetailsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusDetailsSetType.java b/awsapi/src/com/amazon/ec2/VolumeStatusDetailsSetType.java
index b773b0d..97a6d6e 100644
--- a/awsapi/src/com/amazon/ec2/VolumeStatusDetailsSetType.java
+++ b/awsapi/src/com/amazon/ec2/VolumeStatusDetailsSetType.java
@@ -142,7 +142,8 @@ public class VolumeStatusDetailsSetType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class VolumeStatusDetailsSetType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VolumeStatusEventItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusEventItemType.java b/awsapi/src/com/amazon/ec2/VolumeStatusEventItemType.java
index 61cb6ea..e416fbd 100644
--- a/awsapi/src/com/amazon/ec2/VolumeStatusEventItemType.java
+++ b/awsapi/src/com/amazon/ec2/VolumeStatusEventItemType.java
@@ -197,7 +197,8 @@ public class VolumeStatusEventItemType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -406,9 +407,8 @@ public class VolumeStatusEventItemType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VolumeStatusEventsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusEventsSetType.java b/awsapi/src/com/amazon/ec2/VolumeStatusEventsSetType.java
index 436fa6a..a554b04 100644
--- a/awsapi/src/com/amazon/ec2/VolumeStatusEventsSetType.java
+++ b/awsapi/src/com/amazon/ec2/VolumeStatusEventsSetType.java
@@ -142,7 +142,8 @@ public class VolumeStatusEventsSetType implements org.apache.axis2.databinding.A
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class VolumeStatusEventsSetType implements org.apache.axis2.databinding.A
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VolumeStatusInfoType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusInfoType.java b/awsapi/src/com/amazon/ec2/VolumeStatusInfoType.java
index 7ab36ee..dd86c2e 100644
--- a/awsapi/src/com/amazon/ec2/VolumeStatusInfoType.java
+++ b/awsapi/src/com/amazon/ec2/VolumeStatusInfoType.java
@@ -125,7 +125,8 @@ public class VolumeStatusInfoType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class VolumeStatusInfoType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VolumeStatusItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusItemType.java b/awsapi/src/com/amazon/ec2/VolumeStatusItemType.java
index 2b231d3..e82270f 100644
--- a/awsapi/src/com/amazon/ec2/VolumeStatusItemType.java
+++ b/awsapi/src/com/amazon/ec2/VolumeStatusItemType.java
@@ -197,7 +197,8 @@ public class VolumeStatusItemType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -325,9 +326,8 @@ public class VolumeStatusItemType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VolumeStatusSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusSetType.java b/awsapi/src/com/amazon/ec2/VolumeStatusSetType.java
index 2932a20..4e4bac5 100644
--- a/awsapi/src/com/amazon/ec2/VolumeStatusSetType.java
+++ b/awsapi/src/com/amazon/ec2/VolumeStatusSetType.java
@@ -142,7 +142,8 @@ public class VolumeStatusSetType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class VolumeStatusSetType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VpcIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpcIdSetItemType.java b/awsapi/src/com/amazon/ec2/VpcIdSetItemType.java
index bbc6ce2..ac3dba3 100644
--- a/awsapi/src/com/amazon/ec2/VpcIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/VpcIdSetItemType.java
@@ -101,7 +101,8 @@ public class VpcIdSetItemType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class VpcIdSetItemType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VpcIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpcIdSetType.java b/awsapi/src/com/amazon/ec2/VpcIdSetType.java
index 6ffecb3..8f3d7f6 100644
--- a/awsapi/src/com/amazon/ec2/VpcIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/VpcIdSetType.java
@@ -142,7 +142,8 @@ public class VpcIdSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class VpcIdSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,7 +463,8 @@ public class VpcIdSetType implements org.apache.axis2.databinding.ADBBean {
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.VpcIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.VpcIdSetItemType.class, list1));
+ object.setItem((com.amazon.ec2.VpcIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+ com.amazon.ec2.VpcIdSetItemType.class, list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VpcSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpcSetType.java b/awsapi/src/com/amazon/ec2/VpcSetType.java
index 04b0610..9372951 100644
--- a/awsapi/src/com/amazon/ec2/VpcSetType.java
+++ b/awsapi/src/com/amazon/ec2/VpcSetType.java
@@ -142,7 +142,8 @@ public class VpcSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class VpcSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VpcType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpcType.java b/awsapi/src/com/amazon/ec2/VpcType.java
index 58317ff..a17a1af 100644
--- a/awsapi/src/com/amazon/ec2/VpcType.java
+++ b/awsapi/src/com/amazon/ec2/VpcType.java
@@ -291,7 +291,8 @@ public class VpcType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -509,9 +510,8 @@ public class VpcType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VpnConnectionIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnConnectionIdSetItemType.java b/awsapi/src/com/amazon/ec2/VpnConnectionIdSetItemType.java
index 51c1cd1..d34222f 100644
--- a/awsapi/src/com/amazon/ec2/VpnConnectionIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/VpnConnectionIdSetItemType.java
@@ -101,7 +101,8 @@ public class VpnConnectionIdSetItemType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class VpnConnectionIdSetItemType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VpnConnectionIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnConnectionIdSetType.java b/awsapi/src/com/amazon/ec2/VpnConnectionIdSetType.java
index 1527438..a2fcf93 100644
--- a/awsapi/src/com/amazon/ec2/VpnConnectionIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/VpnConnectionIdSetType.java
@@ -142,7 +142,8 @@ public class VpnConnectionIdSetType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class VpnConnectionIdSetType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VpnConnectionOptionsRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnConnectionOptionsRequestType.java b/awsapi/src/com/amazon/ec2/VpnConnectionOptionsRequestType.java
index 9a0558c..d60e83d 100644
--- a/awsapi/src/com/amazon/ec2/VpnConnectionOptionsRequestType.java
+++ b/awsapi/src/com/amazon/ec2/VpnConnectionOptionsRequestType.java
@@ -116,7 +116,8 @@ public class VpnConnectionOptionsRequestType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -194,9 +195,8 @@ public class VpnConnectionOptionsRequestType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VpnConnectionOptionsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnConnectionOptionsResponseType.java b/awsapi/src/com/amazon/ec2/VpnConnectionOptionsResponseType.java
index 79ce967..48c4210 100644
--- a/awsapi/src/com/amazon/ec2/VpnConnectionOptionsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/VpnConnectionOptionsResponseType.java
@@ -116,7 +116,8 @@ public class VpnConnectionOptionsResponseType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -194,9 +195,8 @@ public class VpnConnectionOptionsResponseType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VpnConnectionSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnConnectionSetType.java b/awsapi/src/com/amazon/ec2/VpnConnectionSetType.java
index a45667e..6b528c9 100644
--- a/awsapi/src/com/amazon/ec2/VpnConnectionSetType.java
+++ b/awsapi/src/com/amazon/ec2/VpnConnectionSetType.java
@@ -142,7 +142,8 @@ public class VpnConnectionSetType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class VpnConnectionSetType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,8 +463,8 @@ public class VpnConnectionSetType implements org.apache.axis2.databinding.ADBBea
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.VpnConnectionType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.VpnConnectionType.class,
- list1));
+ object.setItem((com.amazon.ec2.VpnConnectionType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+ com.amazon.ec2.VpnConnectionType.class, list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VpnConnectionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnConnectionType.java b/awsapi/src/com/amazon/ec2/VpnConnectionType.java
index 6698bf7..6ce38fc 100644
--- a/awsapi/src/com/amazon/ec2/VpnConnectionType.java
+++ b/awsapi/src/com/amazon/ec2/VpnConnectionType.java
@@ -401,7 +401,8 @@ public class VpnConnectionType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -666,9 +667,8 @@ public class VpnConnectionType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -984,7 +984,8 @@ public class VpnConnectionType implements org.apache.axis2.databinding.ADBBean {
while (!reader.isStartElement() && !reader.isEndElement())
reader.next();
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "customerGatewayConfiguration").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "customerGatewayConfiguration").equals(reader.getName())) {
java.lang.String content = reader.getElementText();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VpnGatewayIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnGatewayIdSetItemType.java b/awsapi/src/com/amazon/ec2/VpnGatewayIdSetItemType.java
index 421a9d5..ba507fe 100644
--- a/awsapi/src/com/amazon/ec2/VpnGatewayIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/VpnGatewayIdSetItemType.java
@@ -101,7 +101,8 @@ public class VpnGatewayIdSetItemType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class VpnGatewayIdSetItemType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VpnGatewayIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnGatewayIdSetType.java b/awsapi/src/com/amazon/ec2/VpnGatewayIdSetType.java
index 44149cc..e0760fb 100644
--- a/awsapi/src/com/amazon/ec2/VpnGatewayIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/VpnGatewayIdSetType.java
@@ -142,7 +142,8 @@ public class VpnGatewayIdSetType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class VpnGatewayIdSetType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VpnGatewaySetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnGatewaySetType.java b/awsapi/src/com/amazon/ec2/VpnGatewaySetType.java
index a909560..585fde1 100644
--- a/awsapi/src/com/amazon/ec2/VpnGatewaySetType.java
+++ b/awsapi/src/com/amazon/ec2/VpnGatewaySetType.java
@@ -142,7 +142,8 @@ public class VpnGatewaySetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class VpnGatewaySetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,7 +463,8 @@ public class VpnGatewaySetType implements org.apache.axis2.databinding.ADBBean {
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.VpnGatewayType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.VpnGatewayType.class, list1));
+ object.setItem((com.amazon.ec2.VpnGatewayType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.VpnGatewayType.class,
+ list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VpnGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnGatewayType.java b/awsapi/src/com/amazon/ec2/VpnGatewayType.java
index ebeebef..a1f98a9 100644
--- a/awsapi/src/com/amazon/ec2/VpnGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/VpnGatewayType.java
@@ -249,7 +249,8 @@ public class VpnGatewayType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -436,9 +437,8 @@ public class VpnGatewayType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VpnStaticRouteType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnStaticRouteType.java b/awsapi/src/com/amazon/ec2/VpnStaticRouteType.java
index 2549634..50f2ca2 100644
--- a/awsapi/src/com/amazon/ec2/VpnStaticRouteType.java
+++ b/awsapi/src/com/amazon/ec2/VpnStaticRouteType.java
@@ -149,7 +149,8 @@ public class VpnStaticRouteType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -294,9 +295,8 @@ public class VpnStaticRouteType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VpnStaticRoutesSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnStaticRoutesSetType.java b/awsapi/src/com/amazon/ec2/VpnStaticRoutesSetType.java
index d0251fc..4259e96 100644
--- a/awsapi/src/com/amazon/ec2/VpnStaticRoutesSetType.java
+++ b/awsapi/src/com/amazon/ec2/VpnStaticRoutesSetType.java
@@ -142,7 +142,8 @@ public class VpnStaticRoutesSetType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class VpnStaticRoutesSetType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,8 +463,8 @@ public class VpnStaticRoutesSetType implements org.apache.axis2.databinding.ADBB
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.VpnStaticRouteType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.VpnStaticRouteType.class,
- list1));
+ object.setItem((com.amazon.ec2.VpnStaticRouteType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+ com.amazon.ec2.VpnStaticRouteType.class, list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/VpnTunnelTelemetryType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/VpnTunnelTelemetryType.java b/awsapi/src/com/amazon/ec2/VpnTunnelTelemetryType.java
index eb63c21..0ce55ff 100644
--- a/awsapi/src/com/amazon/ec2/VpnTunnelTelemetryType.java
+++ b/awsapi/src/com/amazon/ec2/VpnTunnelTelemetryType.java
@@ -211,7 +211,8 @@ public class VpnTunnelTelemetryType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -417,9 +418,8 @@ public class VpnTunnelTelemetryType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
[41/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
index 027a341..9277c49 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vpn;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.api.response.RemoteAccessVpnResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
index 6efea4a..821a4b0 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vpn;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.Site2SiteCustomerGatewayResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.network.Site2SiteCustomerGateway;
@@ -58,10 +58,16 @@ public class CreateVpnCustomerGatewayCmd extends BaseAsyncCmd {
@Parameter(name = ApiConstants.ESP_POLICY, type = CommandType.STRING, required = true, description = "ESP policy of the customer gateway")
private String espPolicy;
- @Parameter(name = ApiConstants.IKE_LIFETIME, type = CommandType.LONG, required = false, description = "Lifetime of phase 1 VPN connection to the customer gateway, in seconds")
+ @Parameter(name = ApiConstants.IKE_LIFETIME,
+ type = CommandType.LONG,
+ required = false,
+ description = "Lifetime of phase 1 VPN connection to the customer gateway, in seconds")
private Long ikeLifetime;
- @Parameter(name = ApiConstants.ESP_LIFETIME, type = CommandType.LONG, required = false, description = "Lifetime of phase 2 VPN connection to the customer gateway, in seconds")
+ @Parameter(name = ApiConstants.ESP_LIFETIME,
+ type = CommandType.LONG,
+ required = false,
+ description = "Lifetime of phase 2 VPN connection to the customer gateway, in seconds")
private Long espLifetime;
@Parameter(name = ApiConstants.DPD, type = CommandType.BOOLEAN, required = false, description = "If DPD is enabled for VPN connection")
@@ -74,7 +80,7 @@ public class CreateVpnCustomerGatewayCmd extends BaseAsyncCmd {
type = CommandType.UUID,
entityType = DomainResponse.class,
description = "the domain ID associated with the gateway. If used with the account parameter returns the "
- + "gateway associated with the account for the specified domain.")
+ + "gateway associated with the account for the specified domain.")
private Long domainId;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java
index f81a4ad..8955c8e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java
@@ -40,7 +40,11 @@ public class CreateVpnGatewayCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.VPC_ID, type = CommandType.UUID, entityType = VpcResponse.class, required = true, description = "public ip address id of the vpn gateway")
+ @Parameter(name = ApiConstants.VPC_ID,
+ type = CommandType.UUID,
+ entityType = VpcResponse.class,
+ required = true,
+ description = "public ip address id of the vpn gateway")
private Long vpcId;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
index 44daf35..41a8f1e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vpn;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseAsyncCmd;
@@ -25,8 +27,6 @@ import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceUnavailableException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java
index 523b6e4..c86cc59 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vpn;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.Site2SiteVpnConnectionResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceUnavailableException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java
index b979a05..4c777d7 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vpn;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.Site2SiteCustomerGatewayResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.network.Site2SiteCustomerGateway;
@@ -39,7 +40,11 @@ public class DeleteVpnCustomerGatewayCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = Site2SiteCustomerGatewayResponse.class, required = true, description = "id of customer gateway")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = Site2SiteCustomerGatewayResponse.class,
+ required = true,
+ description = "id of customer gateway")
private Long id;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java
index 0d53abb..85f4004 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vpn;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.Site2SiteVpnGatewayResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.network.Site2SiteVpnGateway;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java
index 7a031dc..01e6d37 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.vpn;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
@@ -27,7 +29,6 @@ import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.RemoteAccessVpnResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.RemoteAccessVpn;
import com.cloud.utils.Pair;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java
index 3b0308f..8de6059 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.vpn;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.Site2SiteVpnConnectionResponse;
import org.apache.cloudstack.api.response.VpcResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.Site2SiteVpnConnection;
import com.cloud.utils.Pair;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java
index 446d502..5cd4bfb 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.command.user.vpn;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.Site2SiteCustomerGatewayResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.Site2SiteCustomerGateway;
import com.cloud.utils.Pair;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java
index 4d8108c..75a5e81 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.vpn;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.Site2SiteVpnGatewayResponse;
import org.apache.cloudstack.api.response.VpcResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.Site2SiteVpnGateway;
import com.cloud.utils.Pair;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java
index ec53bec..5136633 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.command.user.vpn;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.VpnUsersResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.VpnUser;
import com.cloud.utils.Pair;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java
index cee7302..4eeef67 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vpn;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java
index ff0c84d..efe6db8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vpn;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.Site2SiteVpnConnectionResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.Site2SiteVpnConnection;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java
index 64ab1e3..5694a74 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.user.vpn;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.Site2SiteCustomerGatewayResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.network.Site2SiteCustomerGateway;
@@ -40,7 +40,11 @@ public class UpdateVpnCustomerGatewayCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = Site2SiteCustomerGatewayResponse.class, required = true, description = "id of customer gateway")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = Site2SiteCustomerGatewayResponse.class,
+ required = true,
+ description = "id of customer gateway")
private Long id;
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = false, description = "name of this customer gateway")
@@ -61,10 +65,16 @@ public class UpdateVpnCustomerGatewayCmd extends BaseAsyncCmd {
@Parameter(name = ApiConstants.ESP_POLICY, type = CommandType.STRING, required = true, description = "ESP policy of the customer gateway")
private String espPolicy;
- @Parameter(name = ApiConstants.IKE_LIFETIME, type = CommandType.LONG, required = false, description = "Lifetime of phase 1 VPN connection to the customer gateway, in seconds")
+ @Parameter(name = ApiConstants.IKE_LIFETIME,
+ type = CommandType.LONG,
+ required = false,
+ description = "Lifetime of phase 1 VPN connection to the customer gateway, in seconds")
private Long ikeLifetime;
- @Parameter(name = ApiConstants.ESP_LIFETIME, type = CommandType.LONG, required = false, description = "Lifetime of phase 2 VPN connection to the customer gateway, in seconds")
+ @Parameter(name = ApiConstants.ESP_LIFETIME,
+ type = CommandType.LONG,
+ required = false,
+ description = "Lifetime of phase 2 VPN connection to the customer gateway, in seconds")
private Long espLifetime;
@Parameter(name = ApiConstants.DPD, type = CommandType.BOOLEAN, required = false, description = "If DPD is enabled for VPN connection")
@@ -77,7 +87,7 @@ public class UpdateVpnCustomerGatewayCmd extends BaseAsyncCmd {
type = CommandType.UUID,
entityType = DomainResponse.class,
description = "the domain ID associated with the gateway. If used with the account parameter returns the "
- + "gateway associated with the account for the specified domain.")
+ + "gateway associated with the account for the specified domain.")
private Long domainId;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java b/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
index 8a50cbd..471e6d6 100644
--- a/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
@@ -21,6 +21,8 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -28,7 +30,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.InvalidParameterValueException;
@@ -47,7 +48,7 @@ public class ListZonesByCmd extends BaseListCmd {
@Parameter(name = ApiConstants.AVAILABLE,
type = CommandType.BOOLEAN,
description = "true if you want to retrieve all available Zones. False if you only want to return the Zones"
- + " from which you have at least one VM. Default is false.")
+ + " from which you have at least one VM. Default is false.")
private Boolean available;
@Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "the ID of the domain associated with the zone")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/AddIpToVmNicResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/AddIpToVmNicResponse.java b/api/src/org/apache/cloudstack/api/response/AddIpToVmNicResponse.java
index 0f339be..0725d40 100644
--- a/api/src/org/apache/cloudstack/api/response/AddIpToVmNicResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/AddIpToVmNicResponse.java
@@ -16,14 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
-import java.util.Date;
-import java.util.List;
+import com.google.gson.annotations.SerializedName;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
public class AddIpToVmNicResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/AlertResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/AlertResponse.java b/api/src/org/apache/cloudstack/api/response/AlertResponse.java
index 308ced5..5a27915 100644
--- a/api/src/org/apache/cloudstack/api/response/AlertResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/AlertResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.alert.Alert;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = Alert.class)
@SuppressWarnings("unused")
@@ -34,11 +35,12 @@ public class AlertResponse extends BaseResponse {
private String id;
@SerializedName(ApiConstants.TYPE)
- @Param(description = "One of the following alert types: " + "MEMORY = 0, CPU = 1, STORAGE = 2, STORAGE_ALLOCATED = 3, PUBLIC_IP = 4, PRIVATE_IP = 5, HOST = 6, USERVM = 7, "
- + "DOMAIN_ROUTER = 8, CONSOLE_PROXY = 9, ROUTING = 10: lost connection to default route (to the gateway), "
- + "STORAGE_MISC = 11: lost connection to default route (to the gateway), " + "USAGE_SERVER = 12: lost connection to default route (to the gateway), "
- + "MANAGMENT_NODE = 13: lost connection to default route (to the gateway), "
- + "DOMAIN_ROUTER_MIGRATE = 14, CONSOLE_PROXY_MIGRATE = 15, USERVM_MIGRATE = 16, VLAN = 17, SSVM = 18, " + "USAGE_SERVER_RESULT = 19")
+ @Param(description = "One of the following alert types: "
+ + "MEMORY = 0, CPU = 1, STORAGE = 2, STORAGE_ALLOCATED = 3, PUBLIC_IP = 4, PRIVATE_IP = 5, HOST = 6, USERVM = 7, "
+ + "DOMAIN_ROUTER = 8, CONSOLE_PROXY = 9, ROUTING = 10: lost connection to default route (to the gateway), "
+ + "STORAGE_MISC = 11: lost connection to default route (to the gateway), " + "USAGE_SERVER = 12: lost connection to default route (to the gateway), "
+ + "MANAGMENT_NODE = 13: lost connection to default route (to the gateway), "
+ + "DOMAIN_ROUTER_MIGRATE = 14, CONSOLE_PROXY_MIGRATE = 15, USERVM_MIGRATE = 16, VLAN = 17, SSVM = 18, " + "USAGE_SERVER_RESULT = 19")
private Short alertType;
@SerializedName(ApiConstants.DESCRIPTION)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java b/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java
index bdbb954..edaac07 100644
--- a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java
@@ -16,11 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
/**
*
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerResponse.java b/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerResponse.java
index ef5c8d4..1e9f9c7 100644
--- a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerResponse.java
@@ -17,15 +17,14 @@
package org.apache.cloudstack.api.response;
-import java.util.LinkedHashSet;
import java.util.List;
-import java.util.Set;
+
+import com.google.gson.annotations.SerializedName;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
public class ApplicationLoadBalancerResponse extends BaseResponse implements ControlledEntityResponse {
@@ -89,6 +88,7 @@ public class ApplicationLoadBalancerResponse extends BaseResponse implements Con
@Param(description = "the list of resource tags associated with the Load Balancer", responseObject = ResourceTagResponse.class)
private List<ResourceTagResponse> tags;
+ @Override
public void setAccountName(String accountName) {
this.accountName = accountName;
}
@@ -98,6 +98,7 @@ public class ApplicationLoadBalancerResponse extends BaseResponse implements Con
this.domainId = domainId;
}
+ @Override
public void setDomainName(String domainName) {
this.domainName = domainName;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerRuleResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerRuleResponse.java b/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerRuleResponse.java
index 2de19b7..8af6427 100644
--- a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerRuleResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerRuleResponse.java
@@ -17,11 +17,12 @@
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
/**
* Subobject of the load balancer container response
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java b/api/src/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java
index 89920c1..bf85d8b 100644
--- a/api/src/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.as.AutoScalePolicy;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = AutoScalePolicy.class)
public class AutoScalePolicyResponse extends BaseResponse implements ControlledEntityResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java b/api/src/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java
index 4f4df48..a88325f 100644
--- a/api/src/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.as.AutoScaleVmGroup;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = AutoScaleVmGroup.class)
public class AutoScaleVmGroupResponse extends BaseResponse implements ControlledEntityResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java b/api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java
index 9d84d93..e1c33e7 100644
--- a/api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java
@@ -20,6 +20,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd.CommandType;
import org.apache.cloudstack.api.BaseResponse;
@@ -29,7 +31,6 @@ import org.apache.cloudstack.api.Parameter;
import com.cloud.network.as.AutoScaleVmProfile;
import com.cloud.serializer.Param;
import com.cloud.utils.Pair;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = AutoScaleVmProfile.class)
public class AutoScaleVmProfileResponse extends BaseResponse implements ControlledEntityResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/CapabilityResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/CapabilityResponse.java b/api/src/org/apache/cloudstack/api/response/CapabilityResponse.java
index c707482..6862a55 100644
--- a/api/src/org/apache/cloudstack/api/response/CapabilityResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/CapabilityResponse.java
@@ -16,11 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class CapabilityResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/CapacityResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/CapacityResponse.java b/api/src/org/apache/cloudstack/api/response/CapacityResponse.java
index 6562652..460e4af 100644
--- a/api/src/org/apache/cloudstack/api/response/CapacityResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/CapacityResponse.java
@@ -16,11 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class CapacityResponse extends BaseResponse {
@SerializedName(ApiConstants.TYPE)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/CloudIdentifierResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/CloudIdentifierResponse.java b/api/src/org/apache/cloudstack/api/response/CloudIdentifierResponse.java
index 2847753..94520ef 100644
--- a/api/src/org/apache/cloudstack/api/response/CloudIdentifierResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/CloudIdentifierResponse.java
@@ -16,11 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class CloudIdentifierResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ClusterResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ClusterResponse.java b/api/src/org/apache/cloudstack/api/response/ClusterResponse.java
index d147b6b..0890309 100644
--- a/api/src/org/apache/cloudstack/api/response/ClusterResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ClusterResponse.java
@@ -16,15 +16,17 @@
// under the License.
package org.apache.cloudstack.api.response;
-import com.cloud.org.Cluster;
-import com.cloud.serializer.Param;
+import java.util.ArrayList;
+import java.util.List;
+
import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
-import java.util.ArrayList;
-import java.util.List;
+import com.cloud.org.Cluster;
+import com.cloud.serializer.Param;
@EntityReference(value = Cluster.class)
public class ClusterResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ConditionResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ConditionResponse.java b/api/src/org/apache/cloudstack/api/response/ConditionResponse.java
index 732b25a..94175f3 100644
--- a/api/src/org/apache/cloudstack/api/response/ConditionResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ConditionResponse.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.as.Condition;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = Condition.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java b/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java
index 5de3350..2d815de 100644
--- a/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java
@@ -16,11 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class ConfigurationResponse extends BaseResponse {
@SerializedName(ApiConstants.CATEGORY)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/CounterResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/CounterResponse.java b/api/src/org/apache/cloudstack/api/response/CounterResponse.java
index 5fe8e56..a9bac00 100644
--- a/api/src/org/apache/cloudstack/api/response/CounterResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/CounterResponse.java
@@ -17,13 +17,14 @@
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.as.Counter;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
@EntityReference(value = Counter.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/CreateSSHKeyPairResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/CreateSSHKeyPairResponse.java b/api/src/org/apache/cloudstack/api/response/CreateSSHKeyPairResponse.java
index a640495..4ed1b53 100644
--- a/api/src/org/apache/cloudstack/api/response/CreateSSHKeyPairResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/CreateSSHKeyPairResponse.java
@@ -16,9 +16,10 @@
// under the License.
package org.apache.cloudstack.api.response;
-import com.cloud.serializer.Param;
import com.google.gson.annotations.SerializedName;
+import com.cloud.serializer.Param;
+
public class CreateSSHKeyPairResponse extends SSHKeyPairResponse {
@SerializedName("privatekey")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java b/api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java
index c46356a..44b7327 100644
--- a/api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java
@@ -16,10 +16,11 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class CustomCertificateResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java b/api/src/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java
index a37800f..c04af8d 100644
--- a/api/src/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java
@@ -16,11 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class DeploymentPlannersResponse extends BaseResponse {
@SerializedName(ApiConstants.NAME)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java
index e5a0abf..affa106 100644
--- a/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.offering.DiskOffering;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = DiskOffering.class)
public class DiskOfferingResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/DomainResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/DomainResponse.java b/api/src/org/apache/cloudstack/api/response/DomainResponse.java
index 87b170b..0c0281e 100644
--- a/api/src/org/apache/cloudstack/api/response/DomainResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/DomainResponse.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.domain.Domain;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = Domain.class)
public class DomainResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java b/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java
index 72c6201..ed16020 100644
--- a/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java
@@ -17,10 +17,11 @@
package org.apache.cloudstack.api.response;
import java.util.Date;
-import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
@@ -28,7 +29,6 @@ import org.apache.cloudstack.api.EntityReference;
import com.cloud.serializer.Param;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.State;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = VirtualMachine.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/EventResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/EventResponse.java b/api/src/org/apache/cloudstack/api/response/EventResponse.java
index d362abc..5ce66ed 100644
--- a/api/src/org/apache/cloudstack/api/response/EventResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/EventResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.event.Event;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = Event.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/EventTypeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/EventTypeResponse.java b/api/src/org/apache/cloudstack/api/response/EventTypeResponse.java
index d50a0a9..45dc06b 100644
--- a/api/src/org/apache/cloudstack/api/response/EventTypeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/EventTypeResponse.java
@@ -16,11 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class EventTypeResponse extends BaseResponse {
@SerializedName(ApiConstants.NAME)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ExceptionResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ExceptionResponse.java b/api/src/org/apache/cloudstack/api/response/ExceptionResponse.java
index 5a2dfb7..65d4ac3 100644
--- a/api/src/org/apache/cloudstack/api/response/ExceptionResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ExceptionResponse.java
@@ -19,11 +19,12 @@ package org.apache.cloudstack.api.response;
import java.util.ArrayList;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
import com.cloud.utils.exception.ExceptionProxyObject;
-import com.google.gson.annotations.SerializedName;
public class ExceptionResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java b/api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java
index aee71b0..b92288d 100644
--- a/api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java
@@ -16,10 +16,11 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class ExternalFirewallResponse extends NetworkDeviceResponse {
@@ -67,10 +68,12 @@ public class ExternalFirewallResponse extends NetworkDeviceResponse {
@Param(description = "the timeout (in seconds) for requests to the external firewall")
private String timeout;
+ @Override
public String getId() {
return id;
}
+ @Override
public void setId(String id) {
this.id = id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java b/api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java
index 770a6e2..fe50b97 100644
--- a/api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java
@@ -16,10 +16,11 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class ExternalLoadBalancerResponse extends NetworkDeviceResponse {
@@ -51,10 +52,12 @@ public class ExternalLoadBalancerResponse extends NetworkDeviceResponse {
@Param(description = "the number of times to retry requests to the external load balancer")
private String numRetries;
+ @Override
public String getId() {
return id;
}
+ @Override
public void setId(String id) {
this.id = id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ExtractResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ExtractResponse.java b/api/src/org/apache/cloudstack/api/response/ExtractResponse.java
index 5aed086..fa7488f 100644
--- a/api/src/org/apache/cloudstack/api/response/ExtractResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ExtractResponse.java
@@ -18,11 +18,12 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class ExtractResponse extends BaseResponse {
@SerializedName(ApiConstants.ID)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
index 6e154f9..e3aaec5 100644
--- a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
@@ -18,11 +18,12 @@ package org.apache.cloudstack.api.response;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
public class FirewallResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java b/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java
index 08d6823..71a3097 100644
--- a/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.rules.FirewallRule;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = FirewallRule.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java b/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java
index 2dff790..c72031b 100644
--- a/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java
@@ -16,10 +16,11 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class GetVMPasswordResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java b/api/src/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java
index 504cfd9..aac7e29 100644
--- a/api/src/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java
@@ -16,14 +16,16 @@
// under the License.
package org.apache.cloudstack.api.response;
-import com.cloud.region.ha.GlobalLoadBalancerRule;
-import com.cloud.serializer.Param;
+import java.util.List;
+
import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
-import java.util.List;
+import com.cloud.region.ha.GlobalLoadBalancerRule;
+import com.cloud.serializer.Param;
@EntityReference(value = GlobalLoadBalancerRule.class)
public class GlobalLoadBalancerResponse extends BaseResponse implements ControlledEntityResponse {
@@ -116,6 +118,7 @@ public class GlobalLoadBalancerResponse extends BaseResponse implements Controll
this.gslbDomainName = domainName;
}
+ @Override
public void setAccountName(String accountName) {
this.accountName = accountName;
}
@@ -135,6 +138,7 @@ public class GlobalLoadBalancerResponse extends BaseResponse implements Controll
this.domainId = domainId;
}
+ @Override
public void setDomainName(String domainName) {
this.domainName = domainName;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java b/api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java
index 112c50f..7872bf2 100644
--- a/api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.serializer.Param;
import com.cloud.storage.GuestOsCategory;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = GuestOsCategory.class)
public class GuestOSCategoryResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java b/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java
index 02bd177..9737d60 100644
--- a/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.serializer.Param;
import com.cloud.storage.GuestOS;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = GuestOS.class)
public class GuestOSResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/GuestVlanRangeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/GuestVlanRangeResponse.java b/api/src/org/apache/cloudstack/api/response/GuestVlanRangeResponse.java
index 42ab661..16ce223 100644
--- a/api/src/org/apache/cloudstack/api/response/GuestVlanRangeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/GuestVlanRangeResponse.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
-import com.cloud.serializer.Param;
import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.GuestVlan;
+import com.cloud.serializer.Param;
@EntityReference(value = GuestVlan.class)
@SuppressWarnings("unused")
@@ -67,14 +68,17 @@ public class GuestVlanRangeResponse extends BaseResponse implements ControlledEn
this.id = id;
}
+ @Override
public void setAccountName(String accountName) {
this.accountName = accountName;
}
+ @Override
public void setDomainId(String domainId) {
this.domainId = domainId;
}
+ @Override
public void setDomainName(String domainName) {
this.domainName = domainName;
}
@@ -83,10 +87,12 @@ public class GuestVlanRangeResponse extends BaseResponse implements ControlledEn
this.guestVlanRange = guestVlanRange;
}
+ @Override
public void setProjectId(String projectId) {
this.projectId = projectId;
}
+ @Override
public void setProjectName(String projectName) {
this.projectName = projectName;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java b/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java
index 48dd9bf1e..6e2e745 100644
--- a/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
@@ -26,7 +28,6 @@ import com.cloud.host.Host;
import com.cloud.host.Status;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = Host.class)
public class HostForMigrationResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/HostResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/HostResponse.java b/api/src/org/apache/cloudstack/api/response/HostResponse.java
index 87884e9..e2d8eb5 100644
--- a/api/src/org/apache/cloudstack/api/response/HostResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/HostResponse.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
@@ -26,7 +28,6 @@ import com.cloud.host.Host;
import com.cloud.host.Status;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = Host.class)
public class HostResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java b/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java
index 75e54be..d6f7c2e 100644
--- a/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.EntityReference;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.hypervisor.HypervisorCapabilities;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = HypervisorCapabilities.class)
public class HypervisorCapabilitiesResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/HypervisorResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/HypervisorResponse.java b/api/src/org/apache/cloudstack/api/response/HypervisorResponse.java
index 072a6b1..2915d7c 100644
--- a/api/src/org/apache/cloudstack/api/response/HypervisorResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/HypervisorResponse.java
@@ -16,11 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class HypervisorResponse extends BaseResponse {
@SerializedName(ApiConstants.NAME)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java b/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java
index 79831ca..4889a56 100644
--- a/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.IpAddress;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = IpAddress.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ImageStoreDetailResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ImageStoreDetailResponse.java b/api/src/org/apache/cloudstack/api/response/ImageStoreDetailResponse.java
index 244539c..8863b63 100644
--- a/api/src/org/apache/cloudstack/api/response/ImageStoreDetailResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ImageStoreDetailResponse.java
@@ -16,10 +16,11 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class ImageStoreDetailResponse extends BaseResponse {
@SerializedName("name")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ImageStoreResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ImageStoreResponse.java b/api/src/org/apache/cloudstack/api/response/ImageStoreResponse.java
index ead9035..bb44a01 100644
--- a/api/src/org/apache/cloudstack/api/response/ImageStoreResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ImageStoreResponse.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.response;
import java.util.LinkedHashSet;
import java.util.Set;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.EntityReference;
import com.cloud.serializer.Param;
import com.cloud.storage.ImageStore;
import com.cloud.storage.ScopeType;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = ImageStore.class)
public class ImageStoreResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java b/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java
index c105aec..a2baf99 100644
--- a/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.serializer.Param;
import com.cloud.vm.InstanceGroup;
-import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
@EntityReference(value = InstanceGroup.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/InternalLoadBalancerElementResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/InternalLoadBalancerElementResponse.java b/api/src/org/apache/cloudstack/api/response/InternalLoadBalancerElementResponse.java
index f1cd90a..15b17d8 100644
--- a/api/src/org/apache/cloudstack/api/response/InternalLoadBalancerElementResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/InternalLoadBalancerElementResponse.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.VirtualRouterProvider;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = VirtualRouterProvider.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java b/api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java
index a1b107d..e9856c7 100644
--- a/api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java
@@ -16,11 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class IpForwardingRuleResponse extends BaseResponse {
@SerializedName(ApiConstants.ID)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java b/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java
index 58e25ab..204fdc8 100644
--- a/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java
@@ -16,10 +16,11 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class IsoVmResponse extends BaseResponse {
@SerializedName("id")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/IsolationMethodResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/IsolationMethodResponse.java b/api/src/org/apache/cloudstack/api/response/IsolationMethodResponse.java
index 6a7da98..86fa0ff 100644
--- a/api/src/org/apache/cloudstack/api/response/IsolationMethodResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/IsolationMethodResponse.java
@@ -16,11 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
public class IsolationMethodResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java b/api/src/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java
index 5dd123c..406a8da 100644
--- a/api/src/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java
@@ -16,11 +16,13 @@
// under the License.
package org.apache.cloudstack.api.response;
-import com.cloud.network.rules.HealthCheckPolicy;
-import com.cloud.serializer.Param;
import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.BaseResponse;
+import com.cloud.network.rules.HealthCheckPolicy;
+import com.cloud.serializer.Param;
+
public class LBHealthCheckPolicyResponse extends BaseResponse {
@SerializedName("id")
@Param(description = "the LB HealthCheck policy ID")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/LBHealthCheckResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/LBHealthCheckResponse.java b/api/src/org/apache/cloudstack/api/response/LBHealthCheckResponse.java
index ddb601a..cbd953d 100644
--- a/api/src/org/apache/cloudstack/api/response/LBHealthCheckResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/LBHealthCheckResponse.java
@@ -16,15 +16,16 @@
// under the License.
package org.apache.cloudstack.api.response;
-import com.cloud.network.rules.HealthCheckPolicy;
-import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
+import java.util.List;
+
import com.google.gson.annotations.SerializedName;
+
+import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
-import java.util.List;
-import java.util.UUID;
+import com.cloud.network.rules.HealthCheckPolicy;
+import com.cloud.serializer.Param;
@EntityReference(value = HealthCheckPolicy.class)
public class LBHealthCheckResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java b/api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java
index d18c18b..76c54cd 100644
--- a/api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java
@@ -20,12 +20,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.network.rules.StickinessPolicy;
import com.cloud.serializer.Param;
import com.cloud.utils.Pair;
-import com.google.gson.annotations.SerializedName;
public class LBStickinessPolicyResponse extends BaseResponse {
@SerializedName("id")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java b/api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java
index 7cbd70f..75c00ac 100644
--- a/api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.rules.StickinessPolicy;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = StickinessPolicy.class)
public class LBStickinessResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java b/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java
index 57fb5ec..03946b9 100644
--- a/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java
@@ -18,11 +18,12 @@ package org.apache.cloudstack.api.response;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
public class LoadBalancerResponse extends BaseResponse implements ControlledEntityResponse {
@@ -134,6 +135,7 @@ public class LoadBalancerResponse extends BaseResponse implements ControlledEnti
this.algorithm = algorithm;
}
+ @Override
public void setAccountName(String accountName) {
this.accountName = accountName;
}
@@ -143,6 +145,7 @@ public class LoadBalancerResponse extends BaseResponse implements ControlledEnti
this.domainId = domainId;
}
+ @Override
public void setDomainName(String domainName) {
this.domainName = domainName;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/NetworkACLItemResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/NetworkACLItemResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkACLItemResponse.java
index 50b7494..430422c 100644
--- a/api/src/org/apache/cloudstack/api/response/NetworkACLItemResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/NetworkACLItemResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.List;
-import com.cloud.network.vpc.NetworkACLItem;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+import com.cloud.network.vpc.NetworkACLItem;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.EntityReference;
@EntityReference(value = NetworkACLItem.class)
public class NetworkACLItemResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java
index 57e71d5..1ee9c33 100644
--- a/api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java
@@ -16,14 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
-import com.cloud.network.vpc.NetworkACL;
-import com.cloud.serializer.Param;
import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
-import java.util.List;
+import com.cloud.network.vpc.NetworkACL;
+import com.cloud.serializer.Param;
@EntityReference(value = NetworkACL.class)
public class NetworkACLResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java
index 8eb3987..a991c7a 100644
--- a/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java
@@ -16,11 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class NetworkDeviceResponse extends BaseResponse {
@SerializedName(ApiConstants.ID)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java
index f92307e..8219147 100644
--- a/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java
@@ -20,13 +20,14 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.offering.NetworkOffering;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = NetworkOffering.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/NetworkResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/NetworkResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkResponse.java
index 0f0ce9f..58ec956 100644
--- a/api/src/org/apache/cloudstack/api/response/NetworkResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/NetworkResponse.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.response;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
@@ -25,7 +27,6 @@ import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.Network;
import com.cloud.projects.ProjectAccount;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
@EntityReference(value = {Network.class, ProjectAccount.class})
@@ -279,6 +280,7 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes
this.type = type;
}
+ @Override
public void setAccountName(String accountName) {
this.accountName = accountName;
}
@@ -312,6 +314,7 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes
this.isSystem = isSystem;
}
+ @Override
public void setDomainName(String domain) {
this.domain = domain;
}
[39/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java
index 59d2e8e..3755353 100644
--- a/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java
@@ -19,14 +19,16 @@ package org.apache.cloudstack.api.command.test;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.command.user.vpn.AddVpnUserCmd;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.mockito.Matchers;
import org.mockito.Mockito;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.vpn.AddVpnUserCmd;
+
import com.cloud.network.VpnUser;
import com.cloud.network.vpn.RemoteAccessVpnService;
import com.cloud.user.Account;
@@ -39,6 +41,7 @@ public class AddVpnUserCmdTest extends TestCase {
@Rule
public ExpectedException expectedException = ExpectedException.none();
+ @Override
@Before
public void setUp() {
@@ -99,14 +102,14 @@ public class AddVpnUserCmdTest extends TestCase {
AccountService accountService = Mockito.mock(AccountService.class);
Account account = Mockito.mock(Account.class);
- Mockito.when(accountService.getAccount(Mockito.anyLong())).thenReturn(account);
+ Mockito.when(accountService.getAccount(Matchers.anyLong())).thenReturn(account);
addVpnUserCmd._accountService = accountService;
RemoteAccessVpnService ravService = Mockito.mock(RemoteAccessVpnService.class);
VpnUser vpnUser = Mockito.mock(VpnUser.class);
- Mockito.when(ravService.addVpnUser(Mockito.anyLong(), Mockito.anyString(), Mockito.anyString())).thenReturn(vpnUser);
+ Mockito.when(ravService.addVpnUser(Matchers.anyLong(), Matchers.anyString(), Matchers.anyString())).thenReturn(vpnUser);
addVpnUserCmd._ravService = ravService;
@@ -119,12 +122,12 @@ public class AddVpnUserCmdTest extends TestCase {
AccountService accountService = Mockito.mock(AccountService.class);
Account account = Mockito.mock(Account.class);
- Mockito.when(accountService.getAccount(Mockito.anyLong())).thenReturn(account);
+ Mockito.when(accountService.getAccount(Matchers.anyLong())).thenReturn(account);
addVpnUserCmd._accountService = accountService;
RemoteAccessVpnService ravService = Mockito.mock(RemoteAccessVpnService.class);
- Mockito.when(ravService.addVpnUser(Mockito.anyLong(), Mockito.anyString(), Mockito.anyString())).thenReturn(null);
+ Mockito.when(ravService.addVpnUser(Matchers.anyLong(), Matchers.anyString(), Matchers.anyString())).thenReturn(null);
addVpnUserCmd._ravService = ravService;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
index b838946..6b56591 100644
--- a/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
@@ -16,30 +16,26 @@
// under the License.
package org.apache.cloudstack.api.command.test;
-import com.cloud.configuration.ConfigurationService;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.resource.ResourceService;
-import com.cloud.server.ManagementService;
-import com.cloud.utils.Pair;
+import java.util.ArrayList;
+import java.util.List;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.cloudstack.api.ResponseGenerator;
-import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd;
-import org.apache.cloudstack.api.response.ConfigurationResponse;
-import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.cloudstack.config.Configuration;
-
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.mockito.Mockito;
-import java.util.ArrayList;
-import java.util.List;
+import org.apache.cloudstack.api.ResponseGenerator;
+import org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd;
+import org.apache.cloudstack.api.response.ConfigurationResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.config.Configuration;
+
+import com.cloud.server.ManagementService;
+import com.cloud.utils.Pair;
public class ListCfgCmdTest extends TestCase {
@@ -50,6 +46,7 @@ public class ListCfgCmdTest extends TestCase {
@Rule
public ExpectedException expectedException = ExpectedException.none();
+ @Override
@Before
public void setUp() {
responseGenerator = Mockito.mock(ResponseGenerator.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/RegionCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/org/apache/cloudstack/api/command/test/RegionCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/RegionCmdTest.java
index 9ed4752..10c3d85 100644
--- a/api/test/org/apache/cloudstack/api/command/test/RegionCmdTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/RegionCmdTest.java
@@ -19,17 +19,19 @@ package org.apache.cloudstack.api.command.test;
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mockito.Matchers;
+import org.mockito.Mockito;
+
import org.apache.cloudstack.api.ResponseGenerator;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.admin.region.AddRegionCmd;
import org.apache.cloudstack.api.response.RegionResponse;
import org.apache.cloudstack.region.Region;
import org.apache.cloudstack.region.RegionService;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.mockito.Mockito;
public class RegionCmdTest extends TestCase {
@@ -39,6 +41,7 @@ public class RegionCmdTest extends TestCase {
@Rule
public ExpectedException expectedException = ExpectedException.none();
+ @Override
@Before
public void setUp() {
@@ -63,7 +66,7 @@ public class RegionCmdTest extends TestCase {
RegionService regionService = Mockito.mock(RegionService.class);
Region region = Mockito.mock(Region.class);
- Mockito.when(regionService.addRegion(Mockito.anyInt(), Mockito.anyString(), Mockito.anyString())).thenReturn(region);
+ Mockito.when(regionService.addRegion(Matchers.anyInt(), Matchers.anyString(), Matchers.anyString())).thenReturn(region);
addRegionCmd._regionService = regionService;
responseGenerator = Mockito.mock(ResponseGenerator.class);
@@ -83,7 +86,7 @@ public class RegionCmdTest extends TestCase {
RegionService regionService = Mockito.mock(RegionService.class);
Region region = Mockito.mock(Region.class);
- Mockito.when(regionService.addRegion(Mockito.anyInt(), Mockito.anyString(), Mockito.anyString())).thenReturn(null);
+ Mockito.when(regionService.addRegion(Matchers.anyInt(), Matchers.anyString(), Matchers.anyString())).thenReturn(null);
addRegionCmd._regionService = regionService;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java
index 7c6f492..0c03e39 100644
--- a/api/test/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java
@@ -16,22 +16,25 @@
// under the License.
package org.apache.cloudstack.api.command.test;
-import com.cloud.uservm.UserVm;
-import com.cloud.vm.UserVmService;
+import java.util.LinkedList;
+import java.util.List;
+
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.cloudstack.api.ResponseGenerator;
-import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.command.user.vm.ScaleVMCmd;
-import org.apache.cloudstack.api.response.UserVmResponse;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.mockito.Mockito;
-import java.util.LinkedList;
-import java.util.List;
+
+import org.apache.cloudstack.api.ResponseGenerator;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.vm.ScaleVMCmd;
+import org.apache.cloudstack.api.response.UserVmResponse;
+
+import com.cloud.uservm.UserVm;
+import com.cloud.vm.UserVmService;
public class ScaleVMCmdTest extends TestCase {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
index 5a860cd..a07608a 100644
--- a/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
@@ -16,24 +16,23 @@
// under the License.
package org.apache.cloudstack.api.command.test;
-import com.cloud.configuration.ConfigurationService;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.resource.ResourceService;
-
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mockito.Mockito;
+
import org.apache.cloudstack.api.ResponseGenerator;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
import org.apache.cloudstack.api.response.ConfigurationResponse;
import org.apache.cloudstack.config.Configuration;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.mockito.Mockito;
+import com.cloud.configuration.ConfigurationService;
+import com.cloud.exception.InvalidParameterValueException;
public class UpdateCfgCmdTest extends TestCase {
@@ -44,6 +43,7 @@ public class UpdateCfgCmdTest extends TestCase {
@Rule
public ExpectedException expectedException = ExpectedException.none();
+ @Override
@Before
public void setUp() {
responseGenerator = Mockito.mock(ResponseGenerator.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/UsageCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/org/apache/cloudstack/api/command/test/UsageCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/UsageCmdTest.java
index ca31eda..cadf275 100644
--- a/api/test/org/apache/cloudstack/api/command/test/UsageCmdTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/UsageCmdTest.java
@@ -21,15 +21,16 @@ import java.util.List;
import junit.framework.TestCase;
-import org.apache.cloudstack.api.command.admin.usage.GetUsageRecordsCmd;
-import org.apache.cloudstack.usage.Usage;
-import org.apache.cloudstack.usage.UsageService;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.mockito.Mockito;
+import org.apache.cloudstack.api.command.admin.usage.GetUsageRecordsCmd;
+import org.apache.cloudstack.usage.Usage;
+import org.apache.cloudstack.usage.UsageService;
+
import com.cloud.utils.Pair;
public class UsageCmdTest extends TestCase {
@@ -39,6 +40,7 @@ public class UsageCmdTest extends TestCase {
@Rule
public ExpectedException expectedException = ExpectedException.none();
+ @Override
@Before
public void setUp() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ActivateLicense.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicense.java b/awsapi/src/com/amazon/ec2/ActivateLicense.java
index 11fda56..296e581 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicense.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicense.java
@@ -98,7 +98,8 @@ public class ActivateLicense implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ActivateLicense implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class ActivateLicense implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ActivateLicense").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ActivateLicense").equals(reader.getName())) {
object.setActivateLicense(com.amazon.ec2.ActivateLicenseType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java b/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
index 512d741..ad3f4be 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
@@ -98,7 +98,8 @@ public class ActivateLicenseResponse implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ActivateLicenseResponse implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java b/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
index 2810f79..02d73d5 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
@@ -125,7 +125,8 @@ public class ActivateLicenseResponseType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class ActivateLicenseResponseType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicenseType.java b/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
index 445683c..5e7f5c3 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
@@ -125,7 +125,8 @@ public class ActivateLicenseType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class ActivateLicenseType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AllocateAddress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddress.java b/awsapi/src/com/amazon/ec2/AllocateAddress.java
index 4c5ac3b..185f43d 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddress.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddress.java
@@ -98,7 +98,8 @@ public class AllocateAddress implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class AllocateAddress implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class AllocateAddress implements org.apache.axis2.databinding.ADBBean {
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AllocateAddress").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AllocateAddress").equals(reader.getName())) {
object.setAllocateAddress(com.amazon.ec2.AllocateAddressType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java b/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
index 76801a4..bfec997 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
@@ -98,7 +98,8 @@ public class AllocateAddressResponse implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class AllocateAddressResponse implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java b/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
index e0e4e64..57aa866 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
@@ -187,7 +187,8 @@ public class AllocateAddressResponseType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -364,9 +365,8 @@ public class AllocateAddressResponseType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AllocateAddressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddressType.java b/awsapi/src/com/amazon/ec2/AllocateAddressType.java
index 5127044..52b183c 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddressType.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddressType.java
@@ -115,7 +115,8 @@ public class AllocateAddressType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -196,9 +197,8 @@ public class AllocateAddressType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java b/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java
index 720cd34..5777160 100644
--- a/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java
@@ -101,7 +101,8 @@ public class AllocationIdSetItemType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class AllocationIdSetItemType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/AllocationIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocationIdSetType.java b/awsapi/src/com/amazon/ec2/AllocationIdSetType.java
index d029139..d7bfad9 100644
--- a/awsapi/src/com/amazon/ec2/AllocationIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/AllocationIdSetType.java
@@ -142,7 +142,8 @@ public class AllocationIdSetType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class AllocationIdSetType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
[21/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceStateType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStateType.java b/awsapi/src/com/amazon/ec2/InstanceStateType.java
index d00a644..3f61bda 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStateType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStateType.java
@@ -125,7 +125,8 @@ public class InstanceStateType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class InstanceStateType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetItemType.java b/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetItemType.java
index d985cfb..a76dd73 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetItemType.java
@@ -163,7 +163,8 @@ public class InstanceStatusDetailsSetItemType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -308,9 +309,8 @@ public class InstanceStatusDetailsSetItemType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetType.java b/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetType.java
index 2455ec6..4daa0dc 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetType.java
@@ -142,7 +142,8 @@ public class InstanceStatusDetailsSetType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class InstanceStatusDetailsSetType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceStatusEventType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusEventType.java b/awsapi/src/com/amazon/ec2/InstanceStatusEventType.java
index 0d86287..0c0a834 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStatusEventType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStatusEventType.java
@@ -187,7 +187,8 @@ public class InstanceStatusEventType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -364,9 +365,8 @@ public class InstanceStatusEventType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceStatusEventsSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusEventsSetType.java b/awsapi/src/com/amazon/ec2/InstanceStatusEventsSetType.java
index a285c7c..4cb8414 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStatusEventsSetType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStatusEventsSetType.java
@@ -142,7 +142,8 @@ public class InstanceStatusEventsSetType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class InstanceStatusEventsSetType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceStatusItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusItemType.java b/awsapi/src/com/amazon/ec2/InstanceStatusItemType.java
index 015a994..c31b90e 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStatusItemType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStatusItemType.java
@@ -235,7 +235,8 @@ public class InstanceStatusItemType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -368,9 +369,8 @@ public class InstanceStatusItemType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceStatusSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusSetType.java b/awsapi/src/com/amazon/ec2/InstanceStatusSetType.java
index 23b9116..70c0be6 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStatusSetType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStatusSetType.java
@@ -142,7 +142,8 @@ public class InstanceStatusSetType implements org.apache.axis2.databinding.ADBBe
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class InstanceStatusSetType implements org.apache.axis2.databinding.ADBBe
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceStatusType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusType.java b/awsapi/src/com/amazon/ec2/InstanceStatusType.java
index c4fb882..269c556 100644
--- a/awsapi/src/com/amazon/ec2/InstanceStatusType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceStatusType.java
@@ -139,7 +139,8 @@ public class InstanceStatusType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -225,9 +226,8 @@ public class InstanceStatusType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceTypeSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceTypeSetItemType.java b/awsapi/src/com/amazon/ec2/InstanceTypeSetItemType.java
index 8544323..2418732 100644
--- a/awsapi/src/com/amazon/ec2/InstanceTypeSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceTypeSetItemType.java
@@ -101,7 +101,8 @@ public class InstanceTypeSetItemType implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class InstanceTypeSetItemType implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InstanceTypeSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InstanceTypeSetType.java b/awsapi/src/com/amazon/ec2/InstanceTypeSetType.java
index 93174bc..5512a55 100644
--- a/awsapi/src/com/amazon/ec2/InstanceTypeSetType.java
+++ b/awsapi/src/com/amazon/ec2/InstanceTypeSetType.java
@@ -129,7 +129,8 @@ public class InstanceTypeSetType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -195,9 +196,8 @@ public class InstanceTypeSetType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentSetType.java b/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentSetType.java
index 8c00f68..70c4116 100644
--- a/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentSetType.java
+++ b/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentSetType.java
@@ -142,7 +142,8 @@ public class InternetGatewayAttachmentSetType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class InternetGatewayAttachmentSetType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentType.java b/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentType.java
index 0ce1666..fbdecca 100644
--- a/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentType.java
+++ b/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentType.java
@@ -125,7 +125,8 @@ public class InternetGatewayAttachmentType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -238,9 +239,8 @@ public class InternetGatewayAttachmentType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InternetGatewayIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InternetGatewayIdSetItemType.java b/awsapi/src/com/amazon/ec2/InternetGatewayIdSetItemType.java
index 963fcc6..04f2e58 100644
--- a/awsapi/src/com/amazon/ec2/InternetGatewayIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/InternetGatewayIdSetItemType.java
@@ -101,7 +101,8 @@ public class InternetGatewayIdSetItemType implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class InternetGatewayIdSetItemType implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InternetGatewayIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InternetGatewayIdSetType.java b/awsapi/src/com/amazon/ec2/InternetGatewayIdSetType.java
index c63f7d5..0b38ad2 100644
--- a/awsapi/src/com/amazon/ec2/InternetGatewayIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/InternetGatewayIdSetType.java
@@ -142,7 +142,8 @@ public class InternetGatewayIdSetType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class InternetGatewayIdSetType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InternetGatewaySetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InternetGatewaySetType.java b/awsapi/src/com/amazon/ec2/InternetGatewaySetType.java
index 1594382..cc5941e 100644
--- a/awsapi/src/com/amazon/ec2/InternetGatewaySetType.java
+++ b/awsapi/src/com/amazon/ec2/InternetGatewaySetType.java
@@ -142,7 +142,8 @@ public class InternetGatewaySetType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class InternetGatewaySetType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,8 +463,8 @@ public class InternetGatewaySetType implements org.apache.axis2.databinding.ADBB
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.InternetGatewayType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.InternetGatewayType.class,
- list1));
+ object.setItem((com.amazon.ec2.InternetGatewayType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+ com.amazon.ec2.InternetGatewayType.class, list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/InternetGatewayType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/InternetGatewayType.java b/awsapi/src/com/amazon/ec2/InternetGatewayType.java
index 01e83b2..b371f89 100644
--- a/awsapi/src/com/amazon/ec2/InternetGatewayType.java
+++ b/awsapi/src/com/amazon/ec2/InternetGatewayType.java
@@ -163,7 +163,8 @@ public class InternetGatewayType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -254,9 +255,8 @@ public class InternetGatewayType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/IpPermissionSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/IpPermissionSetType.java b/awsapi/src/com/amazon/ec2/IpPermissionSetType.java
index 3a166e6..685c8cf 100644
--- a/awsapi/src/com/amazon/ec2/IpPermissionSetType.java
+++ b/awsapi/src/com/amazon/ec2/IpPermissionSetType.java
@@ -142,7 +142,8 @@ public class IpPermissionSetType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class IpPermissionSetType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,7 +463,8 @@ public class IpPermissionSetType implements org.apache.axis2.databinding.ADBBean
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.IpPermissionType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.IpPermissionType.class, list1));
+ object.setItem((com.amazon.ec2.IpPermissionType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+ com.amazon.ec2.IpPermissionType.class, list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/IpPermissionType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/IpPermissionType.java b/awsapi/src/com/amazon/ec2/IpPermissionType.java
index 204dedc..08fc442 100644
--- a/awsapi/src/com/amazon/ec2/IpPermissionType.java
+++ b/awsapi/src/com/amazon/ec2/IpPermissionType.java
@@ -227,7 +227,8 @@ public class IpPermissionType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -377,9 +378,8 @@ public class IpPermissionType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/IpRangeItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/IpRangeItemType.java b/awsapi/src/com/amazon/ec2/IpRangeItemType.java
index 99f25da..e63b6b3 100644
--- a/awsapi/src/com/amazon/ec2/IpRangeItemType.java
+++ b/awsapi/src/com/amazon/ec2/IpRangeItemType.java
@@ -101,7 +101,8 @@ public class IpRangeItemType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class IpRangeItemType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/IpRangeSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/IpRangeSetType.java b/awsapi/src/com/amazon/ec2/IpRangeSetType.java
index d4a363f..53896eb 100644
--- a/awsapi/src/com/amazon/ec2/IpRangeSetType.java
+++ b/awsapi/src/com/amazon/ec2/IpRangeSetType.java
@@ -142,7 +142,8 @@ public class IpRangeSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class IpRangeSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,7 +463,8 @@ public class IpRangeSetType implements org.apache.axis2.databinding.ADBBean {
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.IpRangeItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.IpRangeItemType.class, list1));
+ object.setItem((com.amazon.ec2.IpRangeItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+ com.amazon.ec2.IpRangeItemType.class, list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/LaunchPermissionItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LaunchPermissionItemType.java b/awsapi/src/com/amazon/ec2/LaunchPermissionItemType.java
index 4c9dd32..8e4d8af 100644
--- a/awsapi/src/com/amazon/ec2/LaunchPermissionItemType.java
+++ b/awsapi/src/com/amazon/ec2/LaunchPermissionItemType.java
@@ -168,7 +168,8 @@ public class LaunchPermissionItemType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -282,9 +283,8 @@ public class LaunchPermissionItemType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/LaunchPermissionListType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LaunchPermissionListType.java b/awsapi/src/com/amazon/ec2/LaunchPermissionListType.java
index 5647ad7..8e16ce7 100644
--- a/awsapi/src/com/amazon/ec2/LaunchPermissionListType.java
+++ b/awsapi/src/com/amazon/ec2/LaunchPermissionListType.java
@@ -142,7 +142,8 @@ public class LaunchPermissionListType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class LaunchPermissionListType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/LaunchPermissionOperationType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LaunchPermissionOperationType.java b/awsapi/src/com/amazon/ec2/LaunchPermissionOperationType.java
index 17b93ec..7df1eaf 100644
--- a/awsapi/src/com/amazon/ec2/LaunchPermissionOperationType.java
+++ b/awsapi/src/com/amazon/ec2/LaunchPermissionOperationType.java
@@ -168,7 +168,8 @@ public class LaunchPermissionOperationType implements org.apache.axis2.databindi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -228,9 +229,8 @@ public class LaunchPermissionOperationType implements org.apache.axis2.databindi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/LaunchSpecificationRequestType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LaunchSpecificationRequestType.java b/awsapi/src/com/amazon/ec2/LaunchSpecificationRequestType.java
index 18438cd..dccdb63 100644
--- a/awsapi/src/com/amazon/ec2/LaunchSpecificationRequestType.java
+++ b/awsapi/src/com/amazon/ec2/LaunchSpecificationRequestType.java
@@ -606,7 +606,8 @@ public class LaunchSpecificationRequestType implements org.apache.axis2.databind
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -952,9 +953,8 @@ public class LaunchSpecificationRequestType implements org.apache.axis2.databind
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/LaunchSpecificationResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LaunchSpecificationResponseType.java b/awsapi/src/com/amazon/ec2/LaunchSpecificationResponseType.java
index 9bdf4fb..c5f1caf 100644
--- a/awsapi/src/com/amazon/ec2/LaunchSpecificationResponseType.java
+++ b/awsapi/src/com/amazon/ec2/LaunchSpecificationResponseType.java
@@ -568,7 +568,8 @@ public class LaunchSpecificationResponseType implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -908,9 +909,8 @@ public class LaunchSpecificationResponseType implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/LicenseCapacitySetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LicenseCapacitySetItemType.java b/awsapi/src/com/amazon/ec2/LicenseCapacitySetItemType.java
index 8992da2..6261a3a 100644
--- a/awsapi/src/com/amazon/ec2/LicenseCapacitySetItemType.java
+++ b/awsapi/src/com/amazon/ec2/LicenseCapacitySetItemType.java
@@ -187,7 +187,8 @@ public class LicenseCapacitySetItemType implements org.apache.axis2.databinding.
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -358,9 +359,8 @@ public class LicenseCapacitySetItemType implements org.apache.axis2.databinding.
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/LicenseCapacitySetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LicenseCapacitySetType.java b/awsapi/src/com/amazon/ec2/LicenseCapacitySetType.java
index 4ea2ef1..78951bf 100644
--- a/awsapi/src/com/amazon/ec2/LicenseCapacitySetType.java
+++ b/awsapi/src/com/amazon/ec2/LicenseCapacitySetType.java
@@ -142,7 +142,8 @@ public class LicenseCapacitySetType implements org.apache.axis2.databinding.ADBB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class LicenseCapacitySetType implements org.apache.axis2.databinding.ADBB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/LicenseIdSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LicenseIdSetItemType.java b/awsapi/src/com/amazon/ec2/LicenseIdSetItemType.java
index 75d4b31..78bfd10 100644
--- a/awsapi/src/com/amazon/ec2/LicenseIdSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/LicenseIdSetItemType.java
@@ -101,7 +101,8 @@ public class LicenseIdSetItemType implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -182,9 +183,8 @@ public class LicenseIdSetItemType implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/LicenseIdSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LicenseIdSetType.java b/awsapi/src/com/amazon/ec2/LicenseIdSetType.java
index 4c60efd..089c8e7 100644
--- a/awsapi/src/com/amazon/ec2/LicenseIdSetType.java
+++ b/awsapi/src/com/amazon/ec2/LicenseIdSetType.java
@@ -142,7 +142,8 @@ public class LicenseIdSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class LicenseIdSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/LicenseSetItemType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LicenseSetItemType.java b/awsapi/src/com/amazon/ec2/LicenseSetItemType.java
index 1e5fca4..59d2bc7 100644
--- a/awsapi/src/com/amazon/ec2/LicenseSetItemType.java
+++ b/awsapi/src/com/amazon/ec2/LicenseSetItemType.java
@@ -211,7 +211,8 @@ public class LicenseSetItemType implements org.apache.axis2.databinding.ADBBean
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -366,9 +367,8 @@ public class LicenseSetItemType implements org.apache.axis2.databinding.ADBBean
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/LicenseSetType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/LicenseSetType.java b/awsapi/src/com/amazon/ec2/LicenseSetType.java
index 1cf864d..2fe88ea 100644
--- a/awsapi/src/com/amazon/ec2/LicenseSetType.java
+++ b/awsapi/src/com/amazon/ec2/LicenseSetType.java
@@ -142,7 +142,8 @@ public class LicenseSetType implements org.apache.axis2.databinding.ADBBean {
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -208,9 +209,8 @@ public class LicenseSetType implements org.apache.axis2.databinding.ADBBean {
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -463,8 +463,8 @@ public class LicenseSetType implements org.apache.axis2.databinding.ADBBean {
}
// call the converter utility to convert and set the array
- object.setItem((com.amazon.ec2.LicenseSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.LicenseSetItemType.class,
- list1));
+ object.setItem((com.amazon.ec2.LicenseSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
+ com.amazon.ec2.LicenseSetItemType.class, list1));
} // End of if for expected property start element
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyImageAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyImageAttribute.java b/awsapi/src/com/amazon/ec2/ModifyImageAttribute.java
index abb4d0a..d812a4f 100644
--- a/awsapi/src/com/amazon/ec2/ModifyImageAttribute.java
+++ b/awsapi/src/com/amazon/ec2/ModifyImageAttribute.java
@@ -98,7 +98,8 @@ public class ModifyImageAttribute implements org.apache.axis2.databinding.ADBBea
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ModifyImageAttribute implements org.apache.axis2.databinding.ADBBea
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -294,7 +294,8 @@ public class ModifyImageAttribute implements org.apache.axis2.databinding.ADBBea
while (!reader.isEndElement()) {
if (reader.isStartElement()) {
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyImageAttribute").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyImageAttribute").equals(reader.getName())) {
object.setModifyImageAttribute(com.amazon.ec2.ModifyImageAttributeType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponse.java b/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponse.java
index 172e28b..3daabeb 100644
--- a/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class ModifyImageAttributeResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyImageAttributeResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyImageAttributeResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class ModifyImageAttributeResponse implements org.apache.axis2.databindin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class ModifyImageAttributeResponse implements org.apache.axis2.databindin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponseType.java
index d650982..3c6ce91 100644
--- a/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponseType.java
@@ -125,7 +125,8 @@ public class ModifyImageAttributeResponseType implements org.apache.axis2.databi
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class ModifyImageAttributeResponseType implements org.apache.axis2.databi
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyImageAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyImageAttributeType.java b/awsapi/src/com/amazon/ec2/ModifyImageAttributeType.java
index 495fac7..e7fad02 100644
--- a/awsapi/src/com/amazon/ec2/ModifyImageAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/ModifyImageAttributeType.java
@@ -125,7 +125,8 @@ public class ModifyImageAttributeType implements org.apache.axis2.databinding.AD
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class ModifyImageAttributeType implements org.apache.axis2.databinding.AD
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyImageAttributeTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyImageAttributeTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ModifyImageAttributeTypeChoice_type0.java
index ee4a251..0bff53a 100644
--- a/awsapi/src/com/amazon/ec2/ModifyImageAttributeTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/ModifyImageAttributeTypeChoice_type0.java
@@ -210,7 +210,8 @@ public class ModifyImageAttributeTypeChoice_type0 implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -255,9 +256,8 @@ public class ModifyImageAttributeTypeChoice_type0 implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyInstanceAttribute.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyInstanceAttribute.java b/awsapi/src/com/amazon/ec2/ModifyInstanceAttribute.java
index ca9cc28..b1cf91d 100644
--- a/awsapi/src/com/amazon/ec2/ModifyInstanceAttribute.java
+++ b/awsapi/src/com/amazon/ec2/ModifyInstanceAttribute.java
@@ -98,7 +98,8 @@ public class ModifyInstanceAttribute implements org.apache.axis2.databinding.ADB
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +119,8 @@ public class ModifyInstanceAttribute implements org.apache.axis2.databinding.ADB
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponse.java b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponse.java
index 31f456c..c4b7b47 100644
--- a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponse.java
+++ b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponse.java
@@ -30,7 +30,8 @@ package com.amazon.ec2;
public class ModifyInstanceAttributeResponse implements org.apache.axis2.databinding.ADBBean {
- public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyInstanceAttributeResponse", "ns1");
+ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyInstanceAttributeResponse",
+ "ns1");
private static java.lang.String generatePrefix(java.lang.String namespace) {
if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) {
@@ -98,7 +99,8 @@ public class ModifyInstanceAttributeResponse implements org.apache.axis2.databin
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -118,9 +120,8 @@ public class ModifyInstanceAttributeResponse implements org.apache.axis2.databin
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponseType.java
index f36513a..410f958 100644
--- a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponseType.java
@@ -125,7 +125,8 @@ public class ModifyInstanceAttributeResponseType implements org.apache.axis2.dat
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class ModifyInstanceAttributeResponseType implements org.apache.axis2.dat
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeType.java b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeType.java
index b81a325..775b351 100644
--- a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeType.java
+++ b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeType.java
@@ -125,7 +125,8 @@ public class ModifyInstanceAttributeType implements org.apache.axis2.databinding
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -211,9 +212,8 @@ public class ModifyInstanceAttributeType implements org.apache.axis2.databinding
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeTypeChoice_type0.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeTypeChoice_type0.java
index 03a4116..a8bcab9 100644
--- a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeTypeChoice_type0.java
+++ b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeTypeChoice_type0.java
@@ -504,7 +504,8 @@ public class ModifyInstanceAttributeTypeChoice_type0 implements org.apache.axis2
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -559,8 +560,8 @@ public class ModifyInstanceAttributeTypeChoice_type0 implements org.apache.axis2
if (localInstanceInitiatedShutdownBehavior == null) {
throw new org.apache.axis2.databinding.ADBException("instanceInitiatedShutdownBehavior cannot be null!!");
}
- localInstanceInitiatedShutdownBehavior.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "instanceInitiatedShutdownBehavior"),
- factory, xmlWriter);
+ localInstanceInitiatedShutdownBehavior.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/",
+ "instanceInitiatedShutdownBehavior"), factory, xmlWriter);
}
if (localBlockDeviceMappingTracker) {
if (localBlockDeviceMapping == null) {
@@ -592,9 +593,8 @@ public class ModifyInstanceAttributeTypeChoice_type0 implements org.apache.axis2
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -888,7 +888,8 @@ public class ModifyInstanceAttributeTypeChoice_type0 implements org.apache.axis2
else
- if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) {
+ if (reader.isStartElement() &&
+ new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) {
object.setDisableApiTermination(com.amazon.ec2.AttributeBooleanValueType.Factory.parse(reader));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttachmentType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttachmentType.java b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttachmentType.java
index 72f0010..e348c40 100644
--- a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttachmentType.java
+++ b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttachmentType.java
@@ -125,7 +125,8 @@ public class ModifyNetworkInterfaceAttachmentType implements org.apache.axis2.da
}
public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException {
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException,
+ org.apache.axis2.databinding.ADBException {
serialize(parentQName, factory, xmlWriter, false);
}
@@ -235,9 +236,8 @@ public class ModifyNetworkInterfaceAttachmentType implements org.apache.axis2.da
/**
* Util method to write an attribute with the ns prefix
*/
- private void
- writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue,
+ javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
if (xmlWriter.getPrefix(namespace) == null) {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
[47/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java
index 359dc9d..2b0f827 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.resource;
import java.text.DecimalFormat;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -28,7 +30,6 @@ import org.apache.cloudstack.api.response.ClusterResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.capacity.Capacity;
import com.cloud.exception.InvalidParameterValueException;
@@ -51,17 +52,19 @@ public class ListCapacityCmd extends BaseListCmd {
@Parameter(name = ApiConstants.POD_ID, type = CommandType.UUID, entityType = PodResponse.class, description = "lists capacity by the Pod ID")
private Long podId;
- @Parameter(name = ApiConstants.CLUSTER_ID, type = CommandType.UUID, entityType = ClusterResponse.class, since = "3.0.0", description = "lists capacity by the Cluster ID")
+ @Parameter(name = ApiConstants.CLUSTER_ID,
+ type = CommandType.UUID,
+ entityType = ClusterResponse.class,
+ since = "3.0.0",
+ description = "lists capacity by the Cluster ID")
private Long clusterId;
@Parameter(name = ApiConstants.FETCH_LATEST, type = CommandType.BOOLEAN, since = "3.0.0", description = "recalculate capacities and fetch the latest")
private Boolean fetchLatest;
@Parameter(name = ApiConstants.TYPE, type = CommandType.INTEGER, description = "lists capacity by type" + "* CAPACITY_TYPE_MEMORY = 0" + "* CAPACITY_TYPE_CPU = 1"
- + "* CAPACITY_TYPE_STORAGE = 2" + "* CAPACITY_TYPE_STORAGE_ALLOCATED = 3"
- + "* CAPACITY_TYPE_VIRTUAL_NETWORK_PUBLIC_IP = 4" + "* CAPACITY_TYPE_PRIVATE_IP = 5"
- + "* CAPACITY_TYPE_SECONDARY_STORAGE = 6" + "* CAPACITY_TYPE_VLAN = 7"
- + "* CAPACITY_TYPE_DIRECT_ATTACHED_PUBLIC_IP = 8" + "* CAPACITY_TYPE_LOCAL_STORAGE = 9.")
+ + "* CAPACITY_TYPE_STORAGE = 2" + "* CAPACITY_TYPE_STORAGE_ALLOCATED = 3" + "* CAPACITY_TYPE_VIRTUAL_NETWORK_PUBLIC_IP = 4" + "* CAPACITY_TYPE_PRIVATE_IP = 5"
+ + "* CAPACITY_TYPE_SECONDARY_STORAGE = 6" + "* CAPACITY_TYPE_VLAN = 7" + "* CAPACITY_TYPE_DIRECT_ATTACHED_PUBLIC_IP = 8" + "* CAPACITY_TYPE_LOCAL_STORAGE = 9.")
private Integer type;
@Parameter(name = ApiConstants.SORT_BY, type = CommandType.STRING, since = "3.0.0", description = "Sort the results. Available values: Usage")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java
index 5673a49..68ef5ac 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.resource;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.CustomCertificateResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
@@ -48,7 +49,11 @@ public class UploadCustomCertificateCmd extends BaseAsyncCmd {
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = false, description = "A name / alias for the certificate.")
private String alias;
- @Parameter(name = ApiConstants.PRIVATE_KEY, type = CommandType.STRING, required = false, description = "The private key for the attached certificate.", length = 65535)
+ @Parameter(name = ApiConstants.PRIVATE_KEY,
+ type = CommandType.STRING,
+ required = false,
+ description = "The private key for the attached certificate.",
+ length = 65535)
private String privateKey;
@Parameter(name = ApiConstants.DOMAIN_SUFFIX, type = CommandType.STRING, required = true, description = "DNS domain suffix that the certificate is granted for.")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java
index 69ae028..2cfefda 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java
@@ -20,6 +20,8 @@ import java.util.List;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -30,8 +32,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.VirtualRouterProviderResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@@ -110,10 +110,12 @@ public class ConfigureVirtualRouterElementCmd extends BaseAsyncCmd {
return "configuring virtual router provider: " + id;
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.None;
}
+ @Override
public Long getInstanceId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java
index 7640cef..bf5eb18 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java
@@ -20,6 +20,8 @@ import java.util.List;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -30,8 +32,6 @@ import org.apache.cloudstack.api.response.ProviderResponse;
import org.apache.cloudstack.api.response.VirtualRouterProviderResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceAllocationException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
index 10e5dae..2ad312e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.router;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainRouterResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.ResourceUnavailableException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
index 7bbc459..9c91e0f 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.router;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -30,7 +32,6 @@ import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VpcResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.router.VirtualRouter.Role;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java
index 4c91beb..4f04018 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java
@@ -21,6 +21,8 @@ import java.util.List;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -30,7 +32,6 @@ import org.apache.cloudstack.api.command.user.network.ListNetworkOfferingsCmd;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ProviderResponse;
import org.apache.cloudstack.api.response.VirtualRouterProviderResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@@ -97,7 +98,8 @@ public class ListVirtualRouterElementsCmd extends BaseListCmd {
}
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException {
List<? extends VirtualRouterProvider> providers = _service.get(0).searchForVirtualRouterElement(this);
ListResponse<VirtualRouterProviderResponse> response = new ListResponse<VirtualRouterProviderResponse>();
List<VirtualRouterProviderResponse> providerResponses = new ArrayList<VirtualRouterProviderResponse>();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
index 880cbde..15527d3 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.router;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainRouterResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@@ -84,10 +84,12 @@ public class RebootRouterCmd extends BaseAsyncCmd {
return "rebooting router: " + getId();
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.DomainRouter;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
index 23a542e..9196cd0 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.router;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainRouterResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@@ -90,10 +90,12 @@ public class StartRouterCmd extends BaseAsyncCmd {
return "starting router: " + getId();
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.DomainRouter;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
index f2209cf..ee2b9eb 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.router;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainRouterResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InvalidParameterValueException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
index d9bc9f8..04a4e67 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.router;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainRouterResponse;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.router.VirtualRouter;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java
index 296071f..3a20a51 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java
@@ -16,12 +16,9 @@
// under the License.
package org.apache.cloudstack.api.command.admin.router;
-import com.cloud.event.EventTypes;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.router.VirtualRouter;
-import com.cloud.user.Account;
+import java.util.List;
+import java.util.logging.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -35,13 +32,14 @@ import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.DomainRouterResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.PodResponse;
-import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.UpgradeRouterTemplateResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import java.util.List;
-import java.util.logging.Logger;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.user.Account;
@APICommand(name = "upgradeRouterTemplate", description = "Upgrades router to use newer template", responseObject = BaseResponse.class)
public class UpgradeRouterTemplateCmd extends org.apache.cloudstack.api.BaseCmd {
@@ -55,7 +53,10 @@ public class UpgradeRouterTemplateCmd extends org.apache.cloudstack.api.BaseCmd
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = DomainRouterResponse.class, description = "upgrades router with the specified Id")
private Long id;
- @Parameter(name = ApiConstants.CLUSTER_ID, type = CommandType.UUID, entityType = ClusterResponse.class, description = "upgrades all routers within the specified cluster")
+ @Parameter(name = ApiConstants.CLUSTER_ID,
+ type = CommandType.UUID,
+ entityType = ClusterResponse.class,
+ description = "upgrades all routers within the specified cluster")
private Long clusterId;
@Parameter(name = ApiConstants.POD_ID, type = CommandType.UUID, entityType = PodResponse.class, description = "upgrades all routers within the specified pod")
@@ -64,10 +65,16 @@ public class UpgradeRouterTemplateCmd extends org.apache.cloudstack.api.BaseCmd
@Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "upgrades all routers within the specified zone")
private Long zoneId;
- @Parameter(name = ApiConstants.ACCOUNT_ID, type = CommandType.UUID, entityType = AccountResponse.class, description = "upgrades all routers owned by the specified account")
+ @Parameter(name = ApiConstants.ACCOUNT_ID,
+ type = CommandType.UUID,
+ entityType = AccountResponse.class,
+ description = "upgrades all routers owned by the specified account")
private Long accountId;
- @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "upgrades all routers owned by the specified domain")
+ @Parameter(name = ApiConstants.DOMAIN_ID,
+ type = CommandType.UUID,
+ entityType = DomainResponse.class,
+ description = "upgrades all routers owned by the specified domain")
private Long domainId;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
index 1446823..5dcedff 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
@@ -21,6 +21,8 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -29,7 +31,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ImageStoreResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.DiscoveryException;
import com.cloud.storage.ImageStore;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java
index 4d015ae..cc6680b 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java
@@ -34,6 +34,8 @@ import static org.apache.cloudstack.api.BaseCmd.CommandType.STRING;
import java.util.HashMap;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -41,7 +43,6 @@ import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ImageStoreResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.DiscoveryException;
@@ -82,8 +83,8 @@ public final class AddS3Cmd extends BaseCmd {
private Integer socketTimeout = null;
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException,
- NetworkRuleConflictException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException, NetworkRuleConflictException {
AddImageStoreCmd cmd = new AddImageStoreCmd() {
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java
index 76dbd45..b1c5594 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.storage;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.storage.StoragePool;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java
index f9d9a08..1480e75 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java
@@ -18,8 +18,13 @@
*/
package org.apache.cloudstack.api.command.admin.storage;
-import com.cloud.storage.ImageStore;
-import com.cloud.user.Account;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -28,12 +33,9 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ImageStoreResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import com.cloud.storage.ImageStore;
+import com.cloud.user.Account;
@APICommand(name = "createSecondaryStagingStore", description = "create secondary staging store.", responseObject = ImageStoreResponse.class)
public class CreateSecondaryStagingStoreCmd extends BaseCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
index a939567..dfd0026 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.storage;
import java.net.UnknownHostException;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -29,7 +31,6 @@ import org.apache.cloudstack.api.response.ClusterResponse;
import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.ResourceInUseException;
import com.cloud.exception.ResourceUnavailableException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java
index 24a5ccc..602da83 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java
@@ -16,16 +16,16 @@
// under the License.
package org.apache.cloudstack.api.command.admin.storage;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.ImageStoreResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java
index e21ce88..fb63daa 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.storage;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.storage.StoragePool;
import com.cloud.storage.StoragePoolStatus;
@@ -43,7 +44,7 @@ public class DeletePoolCmd extends BaseCmd {
private Long id;
@Parameter(name = ApiConstants.FORCED, type = CommandType.BOOLEAN, required = false, description = "Force destroy storage pool "
- + "(force expunge volumes in Destroyed state as a part of pool removal)")
+ + "(force expunge volumes in Destroyed state as a part of pool removal)")
private Boolean forced;
// ///////////////////////////////////////////////////
@@ -81,7 +82,8 @@ public class DeletePoolCmd extends BaseCmd {
} else {
StoragePool pool = _storageService.getStoragePool(id);
if (pool != null && pool.getStatus() == StoragePoolStatus.Removed) {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to finish storage pool removal. The storage pool will not be used but cleanup is needed");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR,
+ "Failed to finish storage pool removal. The storage pool will not be used but cleanup is needed");
} else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete storage pool");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java
index 8d0ede4..caf937f 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.storage;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ImageStoreResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
index 4f7f67d..10813ca 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
@@ -16,8 +16,11 @@
// under the License.
package org.apache.cloudstack.api.command.admin.storage;
-import com.cloud.storage.StoragePool;
-import com.cloud.utils.Pair;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,10 +29,9 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
-import org.apache.log4j.Logger;
-import java.util.ArrayList;
-import java.util.List;
+import com.cloud.storage.StoragePool;
+import com.cloud.utils.Pair;
@APICommand(name = "findStoragePoolsForMigration", description = "Lists storage pools available for migration of a volume.", responseObject = StoragePoolResponse.class)
public class FindStoragePoolsForMigrationCmd extends BaseListCmd {
@@ -61,6 +63,7 @@ public class FindStoragePoolsForMigrationCmd extends BaseListCmd {
return s_name;
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.StoragePool;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java
index 2c2ca75..bf47084 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.storage;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ImageStoreResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
@APICommand(name = "listImageStores", description = "Lists image stores.", responseObject = ImageStoreResponse.class, since = "4.2.0")
public class ListImageStoresCmd extends BaseListCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/storage/ListS3sCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListS3sCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListS3sCmd.java
index bfb5852..362d69e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListS3sCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListS3sCmd.java
@@ -23,6 +23,7 @@ import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ImageStoreResponse;
import org.apache.cloudstack.api.response.ListResponse;
+
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.NetworkRuleConflictException;
@@ -35,8 +36,8 @@ public class ListS3sCmd extends BaseListCmd {
private static final String COMMAND_NAME = "lists3sresponse";
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException,
- NetworkRuleConflictException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException, NetworkRuleConflictException {
ListImageStoresCmd cmd = new ListImageStoresCmd();
cmd.setProvider("S3");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java
index bd93202..171f971 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.storage;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ImageStoreResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
@APICommand(name = "listSecondaryStagingStores", description = "Lists secondary staging stores.", responseObject = ImageStoreResponse.class, since = "4.2.0")
public class ListSecondaryStagingStoresCmd extends BaseListCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
index a214c60..868b402 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.storage;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
@APICommand(name = "listStoragePools", description = "Lists storage pools.", responseObject = StoragePoolResponse.class)
public class ListStoragePoolsCmd extends BaseListCmd {
@@ -38,7 +39,10 @@ public class ListStoragePoolsCmd extends BaseListCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.CLUSTER_ID, type = CommandType.UUID, entityType = ClusterResponse.class, description = "list storage pools belongig to the specific cluster")
+ @Parameter(name = ApiConstants.CLUSTER_ID,
+ type = CommandType.UUID,
+ entityType = ClusterResponse.class,
+ description = "list storage pools belongig to the specific cluster")
private Long clusterId;
@Parameter(name = ApiConstants.IP_ADDRESS, type = CommandType.STRING, description = "the IP address for the storage pool")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java
index 3ba6178..bac6b7c 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java
@@ -20,6 +20,8 @@ package org.apache.cloudstack.api.command.admin.storage;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -28,7 +30,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.StorageProviderResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@@ -54,8 +55,8 @@ public class ListStorageProvidersCmd extends BaseListCmd {
}
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException,
- NetworkRuleConflictException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException, NetworkRuleConflictException {
if (getType() == null) {
throw new ServerApiException(ApiErrorCode.MALFORMED_PARAMETER_ERROR, "need to specify type: either primary or image");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java
index cede60d..9d11966 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.storage;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.ResourceUnavailableException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
index 6441c93..50be6ba 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.storage;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -25,7 +27,6 @@ import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.StoragePoolResponse;
-import org.apache.log4j.Logger;
import com.cloud.storage.StoragePool;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java b/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java
index 70045d9..3b684f4 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.swift;
import java.util.HashMap;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,7 +29,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.admin.storage.AddImageStoreCmd;
import org.apache.cloudstack.api.response.ImageStoreResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.DiscoveryException;
import com.cloud.storage.ImageStore;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java
index b782dc0..fcc8e46 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.swift;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.command.admin.storage.ListImageStoresCmd;
import org.apache.cloudstack.api.response.ImageStoreResponse;
import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.log4j.Logger;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
index 6f7321f..07e111c 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.systemvm;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SystemVmResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.vm.VirtualMachine;
@@ -38,7 +38,11 @@ public class DestroySystemVmCmd extends BaseAsyncCmd {
private static final String s_name = "destroysystemvmresponse";
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = SystemVmResponse.class, required = true, description = "The ID of the system virtual machine")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = SystemVmResponse.class,
+ required = true,
+ description = "The ID of the system virtual machine")
private Long id;
public Long getId() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
index 10ca470..9480497 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.systemvm;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -30,7 +32,6 @@ import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.SystemVmResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.utils.Pair;
import com.cloud.vm.VirtualMachine;
@@ -60,7 +61,9 @@ public class ListSystemVMsCmd extends BaseListCmd {
@Parameter(name = ApiConstants.STATE, type = CommandType.STRING, description = "the state of the system VM")
private String state;
- @Parameter(name = ApiConstants.SYSTEM_VM_TYPE, type = CommandType.STRING, description = "the system VM type. Possible types are \"consoleproxy\" and \"secondarystoragevm\".")
+ @Parameter(name = ApiConstants.SYSTEM_VM_TYPE,
+ type = CommandType.STRING,
+ description = "the system VM type. Possible types are \"consoleproxy\" and \"secondarystoragevm\".")
private String systemVmType;
@Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "the Zone ID of the system VM")
@@ -118,6 +121,7 @@ public class ListSystemVMsCmd extends BaseListCmd {
return s_name;
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.SystemVm;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java
index ec36ecc..8199e68 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java
@@ -16,15 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.systemvm;
-import com.cloud.event.EventTypes;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.exception.ManagementServerException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.exception.VirtualMachineMigrationException;
-import com.cloud.host.Host;
-import com.cloud.user.Account;
-import com.cloud.vm.VirtualMachine;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -34,7 +27,16 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.SystemVmResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
+
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.ManagementServerException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.exception.VirtualMachineMigrationException;
+import com.cloud.host.Host;
+import com.cloud.user.Account;
+import com.cloud.vm.VirtualMachine;
@APICommand(name = "migrateSystemVm", description = "Attempts Migration of a system virtual machine to the host specified.", responseObject = SystemVmResponse.class)
public class MigrateSystemVMCmd extends BaseAsyncCmd {
@@ -46,10 +48,18 @@ public class MigrateSystemVMCmd extends BaseAsyncCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.HOST_ID, type = CommandType.UUID, entityType = HostResponse.class, required = true, description = "destination Host ID to migrate VM to")
+ @Parameter(name = ApiConstants.HOST_ID,
+ type = CommandType.UUID,
+ entityType = HostResponse.class,
+ required = true,
+ description = "destination Host ID to migrate VM to")
private Long hostId;
- @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = SystemVmResponse.class, required = true, description = "the ID of the virtual machine")
+ @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
+ type = CommandType.UUID,
+ entityType = SystemVmResponse.class,
+ required = true,
+ description = "the ID of the virtual machine")
private Long virtualMachineId;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
index e6bf5fd..1c38b05 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.systemvm;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SystemVmResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.vm.VirtualMachine;
@@ -42,7 +42,11 @@ public class RebootSystemVmCmd extends BaseAsyncCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = SystemVmResponse.class, required = true, description = "The ID of the system virtual machine")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = SystemVmResponse.class,
+ required = true,
+ description = "The ID of the system virtual machine")
private Long id;
/////////////////////////////////////////////////////
@@ -87,10 +91,12 @@ public class RebootSystemVmCmd extends BaseAsyncCmd {
return "rebooting system vm: " + getId();
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.SystemVm;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
index 7a2d6a1..a7c864d 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
@@ -39,8 +39,10 @@ import com.cloud.offering.ServiceOffering;
import com.cloud.user.Account;
import com.cloud.vm.VirtualMachine;
-@APICommand(name = "scaleSystemVm", responseObject = SystemVmResponse.class, description = "Scale the service offering for a system vm (console proxy or secondary storage). "
- + "The system vm must be in a \"Stopped\" state for " + "this command to take effect.")
+@APICommand(name = "scaleSystemVm",
+ responseObject = SystemVmResponse.class,
+ description = "Scale the service offering for a system vm (console proxy or secondary storage). " + "The system vm must be in a \"Stopped\" state for "
+ + "this command to take effect.")
public class ScaleSystemVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpgradeVMCmd.class.getName());
private static final String s_name = "changeserviceforsystemvmresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
index 3c65672..2e65928 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.systemvm;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SystemVmResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.vm.VirtualMachine;
@@ -42,7 +42,11 @@ public class StartSystemVMCmd extends BaseAsyncCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = SystemVmResponse.class, required = true, description = "The ID of the system virtual machine")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = SystemVmResponse.class,
+ required = true,
+ description = "The ID of the system virtual machine")
private Long id;
/////////////////////////////////////////////////////
@@ -91,10 +95,12 @@ public class StartSystemVMCmd extends BaseAsyncCmd {
return "starting system vm: " + getId();
}
+ @Override
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.SystemVm;
}
+ @Override
public Long getInstanceId() {
return getId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
index 1760018..7709ebe 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.systemvm;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SystemVmResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.ResourceUnavailableException;
@@ -44,7 +44,11 @@ public class StopSystemVmCmd extends BaseAsyncCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = SystemVmResponse.class, required = true, description = "The ID of the system virtual machine")
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = SystemVmResponse.class,
+ required = true,
+ description = "The ID of the system virtual machine")
private Long id;
@Parameter(name = ApiConstants.FORCED, type = CommandType.BOOLEAN, required = false, description = "Force stop the VM. The caller knows the VM is stopped.")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
index cbdebe1..1357a7d 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
@@ -37,7 +37,7 @@ import com.cloud.vm.VirtualMachine;
@APICommand(name = "changeServiceForSystemVm",
responseObject = SystemVmResponse.class,
description = "Changes the service offering for a system vm (console proxy or secondary storage). " + "The system vm must be in a \"Stopped\" state for "
- + "this command to take effect.")
+ + "this command to take effect.")
public class UpgradeSystemVMCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpgradeVMCmd.class.getName());
private static final String s_name = "changeserviceforsystemvmresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
index 507b9af..16761ba 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.template;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
@@ -25,7 +27,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java
index a85d757..031fc8d 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java
@@ -16,7 +16,7 @@
// under the License.
package org.apache.cloudstack.api.command.admin.usage;
-import javax.inject.Inject;
+import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.TrafficMonitorResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.host.Host;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
index 4e5c91a..e6e18cb 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.usage;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
import org.apache.cloudstack.api.response.TrafficTypeResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.network.PhysicalNetworkTrafficType;
@@ -147,8 +147,9 @@ public class AddTrafficTypeCmd extends BaseAsyncCreateCmd {
@Override
public void create() throws ResourceAllocationException {
- PhysicalNetworkTrafficType result = _networkService.addTrafficTypeToPhysicalNetwork(getPhysicalNetworkId(), getTrafficType(), getXenLabel(), getKvmLabel(),
- getVmwareLabel(), getSimulatorLabel(), getVlan(), getHypervLabel());
+ PhysicalNetworkTrafficType result =
+ _networkService.addTrafficTypeToPhysicalNetwork(getPhysicalNetworkId(), getTrafficType(), getXenLabel(), getKvmLabel(), getVmwareLabel(),
+ getSimulatorLabel(), getVlan(), getHypervLabel());
if (result != null) {
setEntityId(result.getId());
setEntityUuid(result.getUuid());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java
index d650ce6..debaf00 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java
@@ -16,7 +16,7 @@
// under the License.
package org.apache.cloudstack.api.command.admin.usage;
-import javax.inject.Inject;
+import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
@@ -26,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java
index 583cf71..111e177 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.usage;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -25,7 +27,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.TrafficTypeResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java
index 11bdc86..4fc36ab 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java
@@ -18,12 +18,17 @@ package org.apache.cloudstack.api.command.admin.usage;
import java.util.Date;
-import org.apache.cloudstack.api.*;
-import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
+
import com.cloud.user.Account;
@APICommand(name = "generateUsageRecords",
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java
index ef1bba7..a8bd1e5 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java
@@ -20,6 +20,8 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -30,7 +32,6 @@ import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.UsageRecordResponse;
import org.apache.cloudstack.usage.Usage;
-import org.apache.log4j.Logger;
import com.cloud.utils.Pair;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java
index 49cab07..3592539 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java
@@ -19,7 +19,7 @@ package org.apache.cloudstack.api.command.admin.usage;
import java.util.ArrayList;
import java.util.List;
-import javax.inject.Inject;
+import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
@@ -29,7 +29,6 @@ import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.TrafficMonitorResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
import com.cloud.host.Host;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java
index 38d6e6c..3a1dfba 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.usage;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.TrafficTypeImplementorResponse;
-import org.apache.log4j.Logger;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@@ -61,7 +62,8 @@ public class ListTrafficTypeImplementorsCmd extends BaseListCmd {
}
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException {
List<Pair<TrafficType, String>> results = _networkService.listTrafficTypeImplementor(this);
ListResponse<TrafficTypeImplementorResponse> response = new ListResponse<TrafficTypeImplementorResponse>();
List<TrafficTypeImplementorResponse> responses = new ArrayList<TrafficTypeImplementorResponse>();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java
index 2ef7cb0..378058f 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.usage;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
@@ -27,7 +29,6 @@ import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
import org.apache.cloudstack.api.response.ProviderResponse;
import org.apache.cloudstack.api.response.TrafficTypeResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.PhysicalNetworkTrafficType;
import com.cloud.user.Account;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java
index bc02911..b5e445b 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java
@@ -18,12 +18,13 @@ package org.apache.cloudstack.api.command.admin.usage;
import java.util.List;
-import org.apache.cloudstack.api.APICommand;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.UsageTypeResponse;
+
import com.cloud.user.Account;
@APICommand(name = "listUsageTypes", description = "List Usage Types", responseObject = UsageTypeResponse.class)
@@ -36,6 +37,7 @@ public class ListUsageTypesCmd extends BaseCmd {
return s_name;
}
+ @Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
index 8a56031..2ad470e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.usage;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -23,9 +25,7 @@ import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.BaseCmd.CommandType;
import org.apache.cloudstack.api.response.TrafficTypeResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.network.PhysicalNetworkTrafficType;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java
index 4448a0d..03512db 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.api.command.admin.user;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.UserResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.log4j.Logger;
-
import com.cloud.user.Account;
import com.cloud.user.User;
@@ -150,8 +150,9 @@ public class CreateUserCmd extends BaseCmd {
@Override
public void execute() {
CallContext.current().setEventDetails("UserName: " + getUserName() + ", FirstName :" + getFirstName() + ", LastName: " + getLastName());
- User user = _accountService.createUser(getUserName(), getPassword(), getFirstName(), getLastName(), getEmail(), getTimezone(), getAccountName(), getDomainId(),
- getUserUUID());
+ User user =
+ _accountService.createUser(getUserName(), getPassword(), getFirstName(), getLastName(), getEmail(), getTimezone(), getAccountName(), getDomainId(),
+ getUserUUID());
if (user != null) {
UserResponse response = _responseGenerator.createUserResponse(user);
response.setResponseName(getCommandName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java
index 02fbf4d..6ba382a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.user;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -29,8 +31,6 @@ import org.apache.cloudstack.api.response.UserResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
-
import com.cloud.user.Account;
import com.cloud.user.User;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
index 26af9ff..599328d 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
@@ -18,20 +18,19 @@ package org.apache.cloudstack.api.command.admin.user;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.UserResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
-
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.user.User;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java
index 8088f9d..8d37eda 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.user;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.UserResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
-
import com.cloud.user.Account;
import com.cloud.user.User;
import com.cloud.user.UserAccount;
[40/54] [abbrv] [partial] Reformatted all of the code.
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/NicDetailResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/NicDetailResponse.java b/api/src/org/apache/cloudstack/api/response/NicDetailResponse.java
index a48bc9c..152d101 100644
--- a/api/src/org/apache/cloudstack/api/response/NicDetailResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/NicDetailResponse.java
@@ -16,17 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.Set;
+import com.google.gson.annotations.SerializedName;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
-import org.apache.cloudstack.api.EntityReference;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
public class NicDetailResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/NicResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/NicResponse.java b/api/src/org/apache/cloudstack/api/response/NicResponse.java
index 25f313b..7089f88 100644
--- a/api/src/org/apache/cloudstack/api/response/NicResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/NicResponse.java
@@ -18,16 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
import com.cloud.vm.Nic;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
-import org.apache.cloudstack.api.EntityReference;
@SuppressWarnings("unused")
@EntityReference(value = Nic.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java b/api/src/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java
index 39edfac..e0884c0 100644
--- a/api/src/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java
@@ -16,17 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
-import java.util.Date;
-import java.util.List;
+import com.google.gson.annotations.SerializedName;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
-import com.cloud.network.rules.FirewallRule;
import com.cloud.serializer.Param;
import com.cloud.vm.NicSecondaryIp;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = NicSecondaryIp.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java b/api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java
index b8379ee..1040052 100644
--- a/api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.PhysicalNetwork;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = PhysicalNetwork.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/PodResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/PodResponse.java b/api/src/org/apache/cloudstack/api/response/PodResponse.java
index 1d3015e..7ff0bfc 100644
--- a/api/src/org/apache/cloudstack/api/response/PodResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/PodResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.dc.Pod;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = Pod.class)
public class PodResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/PortableIpRangeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/PortableIpRangeResponse.java b/api/src/org/apache/cloudstack/api/response/PortableIpRangeResponse.java
index a597ab0..ddb2f90 100644
--- a/api/src/org/apache/cloudstack/api/response/PortableIpRangeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/PortableIpRangeResponse.java
@@ -17,17 +17,16 @@
package org.apache.cloudstack.api.response;
-import java.util.Date;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
+import org.apache.cloudstack.region.PortableIpRange;
-import com.cloud.network.IpAddress;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.region.PortableIpRange;
@EntityReference(value = PortableIpRange.class)
public class PortableIpRangeResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/PortableIpResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/PortableIpResponse.java b/api/src/org/apache/cloudstack/api/response/PortableIpResponse.java
index b98c5dc..73008b0 100644
--- a/api/src/org/apache/cloudstack/api/response/PortableIpResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/PortableIpResponse.java
@@ -18,17 +18,15 @@
package org.apache.cloudstack.api.response;
import java.util.Date;
-import java.util.List;
+
+import com.google.gson.annotations.SerializedName;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
+import org.apache.cloudstack.region.PortableIp;
-import com.cloud.network.IpAddress;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.region.PortableIp;
-import org.apache.cloudstack.region.PortableIpRange;
@EntityReference(value = PortableIp.class)
public class PortableIpResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java b/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java
index 1cba39d..413497f 100644
--- a/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.vpc.VpcGateway;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = VpcGateway.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java b/api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java
index 6bff121..7afad59 100644
--- a/api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.projects.ProjectAccount;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = ProjectAccount.class)
@SuppressWarnings("unused")
@@ -65,10 +66,12 @@ public class ProjectAccountResponse extends BaseResponse implements ControlledVi
@Param(description = "the list of users associated with account", responseObject = UserResponse.class)
private List<UserResponse> users;
+ @Override
public void setProjectId(String projectId) {
this.projectId = projectId;
}
+ @Override
public void setProjectName(String projectName) {
this.projectName = projectName;
}
@@ -77,6 +80,7 @@ public class ProjectAccountResponse extends BaseResponse implements ControlledVi
this.accountId = id;
}
+ @Override
public void setAccountName(String accountName) {
this.accountName = accountName;
}
@@ -85,10 +89,12 @@ public class ProjectAccountResponse extends BaseResponse implements ControlledVi
this.accountType = accountType;
}
+ @Override
public void setDomainId(String domainId) {
this.domainId = domainId;
}
+ @Override
public void setDomainName(String domainName) {
this.domainName = domainName;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java b/api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java
index 269319a..8768df7 100644
--- a/api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.projects.ProjectInvitation;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = ProjectInvitation.class)
@SuppressWarnings("unused")
@@ -63,22 +64,27 @@ public class ProjectInvitationResponse extends BaseResponse implements Controlle
this.id = id;
}
+ @Override
public void setProjectId(String projectId) {
this.projectId = projectId;
}
+ @Override
public void setProjectName(String projectName) {
this.projectName = projectName;
}
+ @Override
public void setDomainId(String domainId) {
this.domainId = domainId;
}
+ @Override
public void setDomainName(String domain) {
this.domainName = domain;
}
+ @Override
public void setAccountName(String accountName) {
this.accountName = accountName;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ProviderResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ProviderResponse.java b/api/src/org/apache/cloudstack/api/response/ProviderResponse.java
index 4d41083..5d6ec0d 100644
--- a/api/src/org/apache/cloudstack/api/response/ProviderResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ProviderResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = PhysicalNetworkServiceProvider.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/RegionResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/RegionResponse.java b/api/src/org/apache/cloudstack/api/response/RegionResponse.java
index aa2f34d..6c74fa6 100644
--- a/api/src/org/apache/cloudstack/api/response/RegionResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/RegionResponse.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import org.apache.cloudstack.region.Region;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = Region.class)
public class RegionResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/RegisterResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/RegisterResponse.java b/api/src/org/apache/cloudstack/api/response/RegisterResponse.java
index 271357d5..fd944b0 100644
--- a/api/src/org/apache/cloudstack/api/response/RegisterResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/RegisterResponse.java
@@ -16,10 +16,11 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class RegisterResponse extends BaseResponse {
@SerializedName("apikey")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java b/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
index d548702..e09bd94 100644
--- a/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.RemoteAccessVpn;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = RemoteAccessVpn.class)
@SuppressWarnings("unused")
@@ -84,6 +85,7 @@ public class RemoteAccessVpnResponse extends BaseResponse implements ControlledE
this.presharedKey = presharedKey;
}
+ @Override
public void setAccountName(String accountName) {
this.accountName = accountName;
}
@@ -93,6 +95,7 @@ public class RemoteAccessVpnResponse extends BaseResponse implements ControlledE
this.domainId = domainId;
}
+ @Override
public void setDomainName(String name) {
this.domainName = name;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java b/api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java
index aff3770..7173235 100644
--- a/api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java
@@ -16,11 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
public class ResourceCountResponse extends BaseResponse implements ControlledEntityResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ResourceDetailResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ResourceDetailResponse.java b/api/src/org/apache/cloudstack/api/response/ResourceDetailResponse.java
index 1eb88a7..3ebb9c7 100644
--- a/api/src/org/apache/cloudstack/api/response/ResourceDetailResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ResourceDetailResponse.java
@@ -16,11 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
public class ResourceDetailResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java b/api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java
index b62ccc2..6890915 100644
--- a/api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.configuration.ResourceLimit;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = ResourceLimit.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java b/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java
index 4b05d29..839876e 100644
--- a/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java
@@ -16,11 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
public class ResourceTagResponse extends BaseResponse implements ControlledViewEntityResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java b/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
index 2509a40..4e1d314 100644
--- a/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
@@ -16,11 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class SSHKeyPairResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java b/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java
index 0eea191..0be2ee1 100644
--- a/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java
@@ -16,17 +16,17 @@
// under the License.
package org.apache.cloudstack.api.response;
-import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.security.SecurityGroup;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
@EntityReference(value = SecurityGroup.class)
@@ -103,6 +103,7 @@ public class SecurityGroupResponse extends BaseResponse implements ControlledVie
this.description = description;
}
+ @Override
public void setAccountName(String accountName) {
this.accountName = accountName;
}
@@ -112,6 +113,7 @@ public class SecurityGroupResponse extends BaseResponse implements ControlledVie
this.domainId = domainId;
}
+ @Override
public void setDomainName(String domainName) {
this.domainName = domainName;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java b/api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java
index 1670cfc..e2d525a 100644
--- a/api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.security.SecurityRule;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = SecurityRule.class)
public class SecurityGroupRuleResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
index 90732bc..7ec739e 100644
--- a/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
import java.util.Map;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.offering.ServiceOffering;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = ServiceOffering.class)
public class ServiceOfferingResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ServiceResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ServiceResponse.java b/api/src/org/apache/cloudstack/api/response/ServiceResponse.java
index 99cbc1b..9f5acc1 100644
--- a/api/src/org/apache/cloudstack/api/response/ServiceResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ServiceResponse.java
@@ -16,12 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
-import com.cloud.serializer.Param;
+import java.util.List;
+
import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
-import java.util.List;
+import com.cloud.serializer.Param;
@SuppressWarnings("unused")
public class ServiceResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java b/api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java
index 18eb64d..8a6ccd0 100644
--- a/api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.Site2SiteCustomerGateway;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = Site2SiteCustomerGateway.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java
index 3616bbf..423b6cd 100644
--- a/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.Site2SiteVpnConnection;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = Site2SiteVpnConnection.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java
index d9dc920..c0917c7 100644
--- a/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.Site2SiteVpnGateway;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = Site2SiteVpnGateway.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java b/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java
index 419d505..913d234 100644
--- a/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java
@@ -16,12 +16,13 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.serializer.Param;
import com.cloud.storage.snapshot.SnapshotPolicy;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = SnapshotPolicy.class)
public class SnapshotPolicyResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java b/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java
index 841f3f2..10cb202 100644
--- a/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.serializer.Param;
import com.cloud.storage.Snapshot;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = Snapshot.class)
public class SnapshotResponse extends BaseResponse implements ControlledEntityResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java b/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java
index 7934602..7bc8ee8 100644
--- a/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java
@@ -18,10 +18,11 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class SnapshotScheduleResponse extends BaseResponse {
@SerializedName("id")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/SslCertResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SslCertResponse.java b/api/src/org/apache/cloudstack/api/response/SslCertResponse.java
index 17cad57..6fc7221 100644
--- a/api/src/org/apache/cloudstack/api/response/SslCertResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SslCertResponse.java
@@ -16,14 +16,16 @@
// under the License.
package org.apache.cloudstack.api.response;
-import com.cloud.network.lb.SslCert;
-import com.cloud.serializer.Param;
+import java.util.List;
+
import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
-import java.util.List;
+import com.cloud.network.lb.SslCert;
+import com.cloud.serializer.Param;
//import org.apache.cloudstack.api.EntityReference;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java b/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java
index 3ebe1e5..79c7f90 100644
--- a/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.vpc.StaticRoute;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = StaticRoute.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/StatusResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/StatusResponse.java b/api/src/org/apache/cloudstack/api/response/StatusResponse.java
index 1cb4d8f..fa2b4b2 100644
--- a/api/src/org/apache/cloudstack/api/response/StatusResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/StatusResponse.java
@@ -16,10 +16,10 @@
// under the License.
package org.apache.cloudstack.api.response;
-import org.apache.cloudstack.api.BaseResponse;
-
import com.google.gson.annotations.SerializedName;
+import org.apache.cloudstack.api.BaseResponse;
+
public class StatusResponse extends BaseResponse {
@SerializedName("status")
private Boolean status;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java b/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java
index 1e4cad4..1dc60ce 100644
--- a/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.dc.StorageNetworkIpRange;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = StorageNetworkIpRange.class)
public class StorageNetworkIpRangeResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java
index 1cc8f6f..03a4f34 100644
--- a/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java
@@ -16,16 +16,18 @@
// under the License.
package org.apache.cloudstack.api.response;
-import com.cloud.serializer.Param;
-import com.cloud.storage.StoragePool;
-import com.cloud.storage.StoragePoolStatus;
+import java.util.Date;
+import java.util.Map;
+
import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
-import java.util.Date;
-import java.util.Map;
+import com.cloud.serializer.Param;
+import com.cloud.storage.StoragePool;
+import com.cloud.storage.StoragePoolStatus;
@EntityReference(value = StoragePool.class)
public class StoragePoolResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/StorageProviderResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/StorageProviderResponse.java b/api/src/org/apache/cloudstack/api/response/StorageProviderResponse.java
index 344f8e7..d68979a 100644
--- a/api/src/org/apache/cloudstack/api/response/StorageProviderResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/StorageProviderResponse.java
@@ -18,10 +18,11 @@
*/
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class StorageProviderResponse extends BaseResponse {
@SerializedName("name")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/SuccessResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SuccessResponse.java b/api/src/org/apache/cloudstack/api/response/SuccessResponse.java
index 815b837..0dde6d0 100644
--- a/api/src/org/apache/cloudstack/api/response/SuccessResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SuccessResponse.java
@@ -16,10 +16,11 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class SuccessResponse extends BaseResponse {
@SerializedName("success")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java b/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java
index 94e404a..5e06380 100644
--- a/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java
@@ -16,10 +16,11 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
/*
* This is the generic response for all types of System VMs (SSVM, consoleproxy, domain routers(router, LB, DHCP))
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java
index c843d89..8c27c18 100644
--- a/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.serializer.Param;
import com.cloud.vm.VirtualMachine;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = VirtualMachine.class)
public class SystemVmResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java b/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java
index 2ff11ec..5f0b9a5 100644
--- a/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.serializer.Param;
import com.cloud.template.VirtualMachineTemplate;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = VirtualMachineTemplate.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/TemplateResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/TemplateResponse.java b/api/src/org/apache/cloudstack/api/response/TemplateResponse.java
index e7d81cf..3e21043 100644
--- a/api/src/org/apache/cloudstack/api/response/TemplateResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TemplateResponse.java
@@ -21,6 +21,8 @@ import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
@@ -28,7 +30,6 @@ import org.apache.cloudstack.api.EntityReference;
import com.cloud.serializer.Param;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.template.VirtualMachineTemplate;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = VirtualMachineTemplate.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/TemplateZoneResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/TemplateZoneResponse.java b/api/src/org/apache/cloudstack/api/response/TemplateZoneResponse.java
index cb1fd98..f2e7725 100644
--- a/api/src/org/apache/cloudstack/api/response/TemplateZoneResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TemplateZoneResponse.java
@@ -18,11 +18,12 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class TemplateZoneResponse extends BaseResponse {
@SerializedName(ApiConstants.ZONE_ID)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java b/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java
index 2c2d013..b19c422 100644
--- a/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java
@@ -16,11 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class TrafficMonitorResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java b/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java
index 6532a3f..ebcd7c9 100644
--- a/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java
@@ -16,11 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class TrafficTypeImplementorResponse extends BaseResponse {
@SerializedName(ApiConstants.TRAFFIC_TYPE)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java b/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
index 7ab8532..69dd062 100644
--- a/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.PhysicalNetworkTrafficType;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = PhysicalNetworkTrafficType.class)
public class TrafficTypeResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java b/api/src/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java
index b4910b4..d89631a 100644
--- a/api/src/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java
@@ -16,18 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
-import com.cloud.serializer.Param;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.VirtualMachine.State;
import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import org.apache.cloudstack.jobs.JobInfo;
-import java.util.Date;
-import java.util.LinkedHashSet;
-import java.util.Set;
+import com.cloud.serializer.Param;
@EntityReference(value = JobInfo.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java b/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java
index 09f33c9..c42b64b 100644
--- a/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java
@@ -18,11 +18,12 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class UpgradeVmResponse extends BaseResponse {
@SerializedName("id")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java b/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
index abb9552..5e2e85d 100644
--- a/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
@@ -16,11 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
public class UsageRecordResponse extends BaseResponse implements ControlledEntityResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java b/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java
index 897035a..83b97f0 100644
--- a/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java
@@ -16,11 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
public class UsageTypeResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/UserResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/UserResponse.java b/api/src/org/apache/cloudstack/api/response/UserResponse.java
index f8211cb..40e1561 100644
--- a/api/src/org/apache/cloudstack/api/response/UserResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UserResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.serializer.Param;
import com.cloud.user.User;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = User.class)
public class UserResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/UserVmResponse.java b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
index 3dccf9d..3ca2a1c 100644
--- a/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
@@ -21,6 +21,8 @@ import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
@@ -30,7 +32,6 @@ import com.cloud.network.router.VirtualRouter;
import com.cloud.serializer.Param;
import com.cloud.uservm.UserVm;
import com.cloud.vm.VirtualMachine;
-import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
@EntityReference(value = {VirtualMachine.class, UserVm.class, VirtualRouter.class})
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java b/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java
index 25ad686..168c548 100644
--- a/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.serializer.Param;
import com.cloud.vm.snapshot.VMSnapshot;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = VMSnapshot.class)
public class VMSnapshotResponse extends BaseResponse implements ControlledEntityResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java b/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java
index 4189d64..c3b4671 100644
--- a/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.VirtualRouterProvider;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = VirtualRouterProvider.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java b/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
index aff486a..5921484 100644
--- a/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.dc.Vlan;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = Vlan.class)
@SuppressWarnings("unused")
@@ -131,14 +132,17 @@ public class VlanIpRangeResponse extends BaseResponse implements ControlledEntit
this.vlan = vlan;
}
+ @Override
public void setAccountName(String accountName) {
this.accountName = accountName;
}
+ @Override
public void setDomainId(String domainId) {
this.domainId = domainId;
}
+ @Override
public void setDomainName(String domainName) {
this.domainName = domainName;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/VolumeDetailResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VolumeDetailResponse.java b/api/src/org/apache/cloudstack/api/response/VolumeDetailResponse.java
index b4170a9..957fb48 100644
--- a/api/src/org/apache/cloudstack/api/response/VolumeDetailResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VolumeDetailResponse.java
@@ -16,18 +16,12 @@
// under the License.
package org.apache.cloudstack.api.response;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.Set;
+import com.google.gson.annotations.SerializedName;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
-import org.apache.cloudstack.api.EntityReference;
import com.cloud.serializer.Param;
-import com.cloud.storage.Volume;
-import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
public class VolumeDetailResponse extends BaseResponse {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
index 25fc553..f511662 100644
--- a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
@@ -20,13 +20,14 @@ import java.util.Date;
import java.util.LinkedHashSet;
import java.util.Set;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.serializer.Param;
import com.cloud.storage.Volume;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = Volume.class)
@SuppressWarnings("unused")
@@ -284,6 +285,7 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity
this.created = created;
}
+ @Override
public void setAccountName(String accountName) {
this.accountName = accountName;
}
@@ -293,6 +295,7 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity
this.domainId = domainId;
}
+ @Override
public void setDomainName(String domainName) {
this.domainName = domainName;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java
index 7d555d7..17e4dfd 100644
--- a/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.vpc.VpcOffering;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = VpcOffering.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/VpcResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VpcResponse.java b/api/src/org/apache/cloudstack/api/response/VpcResponse.java
index aaa7d79..fd9b710 100644
--- a/api/src/org/apache/cloudstack/api/response/VpcResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VpcResponse.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response;
import java.util.Date;
import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.vpc.Vpc;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = Vpc.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java b/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java
index 8b70290..3a0e842 100644
--- a/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java
@@ -16,13 +16,14 @@
// under the License.
package org.apache.cloudstack.api.response;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.VpnUser;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@EntityReference(value = VpnUser.class)
@SuppressWarnings("unused")
@@ -67,6 +68,7 @@ public class VpnUsersResponse extends BaseResponse implements ControlledEntityRe
this.userName = name;
}
+ @Override
public void setAccountName(String accountName) {
this.accountName = accountName;
}
@@ -76,6 +78,7 @@ public class VpnUsersResponse extends BaseResponse implements ControlledEntityRe
this.domainId = domainId;
}
+ @Override
public void setDomainName(String name) {
this.domainName = name;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/api/response/ZoneResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ZoneResponse.java b/api/src/org/apache/cloudstack/api/response/ZoneResponse.java
index 7f4687a..bbb9a7b 100644
--- a/api/src/org/apache/cloudstack/api/response/ZoneResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ZoneResponse.java
@@ -21,13 +21,14 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import com.google.gson.annotations.SerializedName;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.dc.DataCenter;
import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
@EntityReference(value = DataCenter.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/context/CallContext.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/context/CallContext.java b/api/src/org/apache/cloudstack/context/CallContext.java
index 6f65091..7a0b2d0 100644
--- a/api/src/org/apache/cloudstack/context/CallContext.java
+++ b/api/src/org/apache/cloudstack/context/CallContext.java
@@ -21,10 +21,11 @@ import java.util.Map;
import java.util.Stack;
import java.util.UUID;
-import org.apache.cloudstack.managed.threadlocal.ManagedThreadLocal;
import org.apache.log4j.Logger;
import org.apache.log4j.NDC;
+import org.apache.cloudstack.managed.threadlocal.ManagedThreadLocal;
+
import com.cloud.exception.CloudAuthenticationException;
import com.cloud.user.Account;
import com.cloud.user.User;
@@ -288,6 +289,12 @@ public class CallContext {
@Override
public String toString() {
- return new StringBuilder("CCtxt[acct=").append(getCallingAccountId()).append("; user=").append(getCallingUserId()).append("; id=").append(contextId).append("]").toString();
+ return new StringBuilder("CCtxt[acct=").append(getCallingAccountId())
+ .append("; user=")
+ .append(getCallingUserId())
+ .append("; id=")
+ .append(contextId)
+ .append("]")
+ .toString();
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/query/QueryService.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/query/QueryService.java b/api/src/org/apache/cloudstack/query/QueryService.java
index 57131ee..792ed04 100644
--- a/api/src/org/apache/cloudstack/query/QueryService.java
+++ b/api/src/org/apache/cloudstack/query/QueryService.java
@@ -16,12 +16,14 @@
// under the License.
package org.apache.cloudstack.query;
+import java.util.List;
+
import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.command.admin.host.ListHostsCmd;
import org.apache.cloudstack.api.command.admin.internallb.ListInternalLBVMsCmd;
import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd;
-import org.apache.cloudstack.api.command.admin.storage.ListSecondaryStagingStoresCmd;
import org.apache.cloudstack.api.command.admin.storage.ListImageStoresCmd;
+import org.apache.cloudstack.api.command.admin.storage.ListSecondaryStagingStoresCmd;
import org.apache.cloudstack.api.command.admin.storage.ListStoragePoolsCmd;
import org.apache.cloudstack.api.command.admin.user.ListUsersCmd;
import org.apache.cloudstack.api.command.user.account.ListAccountsCmd;
@@ -41,12 +43,31 @@ import org.apache.cloudstack.api.command.user.vmgroup.ListVMGroupsCmd;
import org.apache.cloudstack.api.command.user.volume.ListResourceDetailsCmd;
import org.apache.cloudstack.api.command.user.volume.ListVolumesCmd;
import org.apache.cloudstack.api.command.user.zone.ListZonesByCmd;
-import org.apache.cloudstack.api.response.*;
+import org.apache.cloudstack.api.response.AccountResponse;
+import org.apache.cloudstack.api.response.AsyncJobResponse;
+import org.apache.cloudstack.api.response.DiskOfferingResponse;
+import org.apache.cloudstack.api.response.DomainRouterResponse;
+import org.apache.cloudstack.api.response.EventResponse;
+import org.apache.cloudstack.api.response.HostResponse;
+import org.apache.cloudstack.api.response.ImageStoreResponse;
+import org.apache.cloudstack.api.response.InstanceGroupResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.ProjectAccountResponse;
+import org.apache.cloudstack.api.response.ProjectInvitationResponse;
+import org.apache.cloudstack.api.response.ProjectResponse;
+import org.apache.cloudstack.api.response.ResourceDetailResponse;
+import org.apache.cloudstack.api.response.ResourceTagResponse;
+import org.apache.cloudstack.api.response.SecurityGroupResponse;
+import org.apache.cloudstack.api.response.ServiceOfferingResponse;
+import org.apache.cloudstack.api.response.StoragePoolResponse;
+import org.apache.cloudstack.api.response.TemplateResponse;
+import org.apache.cloudstack.api.response.UserResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.api.response.VolumeResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.exception.PermissionDeniedException;
-import java.util.List;
-
/**
* Service used for list api query.
*
@@ -97,8 +118,8 @@ public interface QueryService {
public ListResponse<TemplateResponse> listIsos(ListIsosCmd cmd);
- public ListResponse<AffinityGroupResponse> listAffinityGroups(Long affinityGroupId, String affinityGroupName, String affinityGroupType, Long vmId, String accountName,
- Long domainId, boolean isRecursive, boolean listAll, Long startIndex, Long pageSize);
+ public ListResponse<AffinityGroupResponse> listAffinityGroups(Long affinityGroupId, String affinityGroupName, String affinityGroupType, Long vmId,
+ String accountName, Long domainId, boolean isRecursive, boolean listAll, Long startIndex, Long pageSize);
public List<ResourceDetailResponse> listResourceDetails(ListResourceDetailsCmd cmd);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/src/org/apache/cloudstack/region/PortableIp.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/region/PortableIp.java b/api/src/org/apache/cloudstack/region/PortableIp.java
index b7aa66c..f56bc27 100644
--- a/api/src/org/apache/cloudstack/region/PortableIp.java
+++ b/api/src/org/apache/cloudstack/region/PortableIp.java
@@ -18,7 +18,6 @@ package org.apache.cloudstack.region;
import java.util.Date;
-import com.cloud.utils.net.Ip;
import org.apache.cloudstack.api.InternalIdentity;
public interface PortableIp extends InternalIdentity {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/com/cloud/network/NetworksTest.java
----------------------------------------------------------------------
diff --git a/api/test/com/cloud/network/NetworksTest.java b/api/test/com/cloud/network/NetworksTest.java
index df2985f..849b1b4 100644
--- a/api/test/com/cloud/network/NetworksTest.java
+++ b/api/test/com/cloud/network/NetworksTest.java
@@ -16,7 +16,6 @@
// under the License.
package com.cloud.network;
-import java.net.URI;
import java.net.URISyntaxException;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/ActivateProjectCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/org/apache/cloudstack/api/command/test/ActivateProjectCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/ActivateProjectCmdTest.java
index 02b3920..1e4bb32 100644
--- a/api/test/org/apache/cloudstack/api/command/test/ActivateProjectCmdTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/ActivateProjectCmdTest.java
@@ -19,13 +19,15 @@ package org.apache.cloudstack.api.command.test;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.cloudstack.api.command.user.project.ActivateProjectCmd;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.mockito.Matchers;
import org.mockito.Mockito;
+import org.apache.cloudstack.api.command.user.project.ActivateProjectCmd;
+
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.projects.Project;
import com.cloud.projects.ProjectService;
@@ -38,6 +40,7 @@ public class ActivateProjectCmdTest extends TestCase {
@Rule
public ExpectedException expectedException = ExpectedException.none();
+ @Override
@Before
public void setUp() {
@@ -54,7 +57,7 @@ public class ActivateProjectCmdTest extends TestCase {
@Test
public void testGetEntityOwnerIdForNullProject() {
ProjectService projectService = Mockito.mock(ProjectService.class);
- Mockito.when(projectService.getProject(Mockito.anyLong())).thenReturn(null);
+ Mockito.when(projectService.getProject(Matchers.anyLong())).thenReturn(null);
activateProjectCmd._projectService = projectService;
try {
@@ -71,9 +74,9 @@ public class ActivateProjectCmdTest extends TestCase {
ProjectService projectService = Mockito.mock(ProjectService.class);
Account account = Mockito.mock(Account.class);
Mockito.when(account.getId()).thenReturn(2L);
- Mockito.when(projectService.getProject(Mockito.anyLong())).thenReturn(project);
+ Mockito.when(projectService.getProject(Matchers.anyLong())).thenReturn(project);
- Mockito.when(projectService.getProjectOwner(Mockito.anyLong())).thenReturn(account);
+ Mockito.when(projectService.getProjectOwner(Matchers.anyLong())).thenReturn(account);
activateProjectCmd._projectService = projectService;
Assert.assertEquals(2L, activateProjectCmd.getEntityOwnerId());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java
index f01c4d7..199ee00 100644
--- a/api/test/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java
@@ -19,13 +19,15 @@ package org.apache.cloudstack.api.command.test;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.cloudstack.api.command.user.account.AddAccountToProjectCmd;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.mockito.Matchers;
import org.mockito.Mockito;
+import org.apache.cloudstack.api.command.user.account.AddAccountToProjectCmd;
+
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.projects.Project;
import com.cloud.projects.ProjectService;
@@ -38,6 +40,7 @@ public class AddAccountToProjectCmdTest extends TestCase {
@Rule
public ExpectedException expectedException = ExpectedException.none();
+ @Override
@Before
public void setUp() {
addAccountToProjectCmd = new AddAccountToProjectCmd() {
@@ -98,9 +101,9 @@ public class AddAccountToProjectCmdTest extends TestCase {
Account account = Mockito.mock(Account.class);
Mockito.when(account.getId()).thenReturn(2L);
- Mockito.when(projectService.getProject(Mockito.anyLong())).thenReturn(project);
+ Mockito.when(projectService.getProject(Matchers.anyLong())).thenReturn(project);
- Mockito.when(projectService.getProjectOwner(Mockito.anyLong())).thenReturn(account);
+ Mockito.when(projectService.getProjectOwner(Matchers.anyLong())).thenReturn(account);
addAccountToProjectCmd._projectService = projectService;
Assert.assertEquals(2L, addAccountToProjectCmd.getEntityOwnerId());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java
----------------------------------------------------------------------
diff --git a/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java b/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java
index d7eacb1..195486a 100644
--- a/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java
@@ -16,22 +16,22 @@
// under the License.
package org.apache.cloudstack.api.command.test;
-import com.cloud.vm.NicSecondaryIp;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.cloudstack.api.ResponseGenerator;
-import org.apache.cloudstack.api.command.user.vm.AddIpToVmNicCmd;
-import org.apache.cloudstack.api.command.user.vm.RemoveIpFromVmNicCmd;
-import org.apache.cloudstack.api.response.NicSecondaryIpResponse;
-import org.apache.cloudstack.api.response.SuccessResponse;
-
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.mockito.Matchers;
import org.mockito.Mockito;
+import org.apache.cloudstack.api.ResponseGenerator;
+import org.apache.cloudstack.api.command.user.vm.AddIpToVmNicCmd;
+import org.apache.cloudstack.api.command.user.vm.RemoveIpFromVmNicCmd;
+import org.apache.cloudstack.api.response.NicSecondaryIpResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientAddressCapacityException;
import com.cloud.exception.InsufficientCapacityException;
@@ -40,6 +40,7 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.NetworkService;
import com.cloud.user.Account;
+import com.cloud.vm.NicSecondaryIp;
public class AddIpToVmNicTest extends TestCase {
@@ -51,6 +52,7 @@ public class AddIpToVmNicTest extends TestCase {
@Rule
public ExpectedException expectedException = ExpectedException.none();
+ @Override
@Before
public void setUp() {
addIpToVmNicCmd = new AddIpToVmNicCmd() {
@@ -65,8 +67,8 @@ public class AddIpToVmNicTest extends TestCase {
AddIpToVmNicCmd ipTonicCmd = Mockito.mock(AddIpToVmNicCmd.class);
NicSecondaryIp secIp = Mockito.mock(NicSecondaryIp.class);
- Mockito.when(networkService.allocateSecondaryGuestIP(Mockito.any(Account.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString())).thenReturn(
- secIp);
+ Mockito.when(networkService.allocateSecondaryGuestIP(Matchers.any(Account.class), Matchers.anyLong(), Matchers.anyLong(), Matchers.anyLong(), Matchers.anyString()))
+ .thenReturn(secIp);
ipTonicCmd._networkService = networkService;
responseGenerator = Mockito.mock(ResponseGenerator.class);
@@ -84,8 +86,8 @@ public class AddIpToVmNicTest extends TestCase {
NetworkService networkService = Mockito.mock(NetworkService.class);
AddIpToVmNicCmd ipTonicCmd = Mockito.mock(AddIpToVmNicCmd.class);
- Mockito.when(networkService.allocateSecondaryGuestIP(Mockito.any(Account.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString())).thenReturn(
- null);
+ Mockito.when(networkService.allocateSecondaryGuestIP(Matchers.any(Account.class), Matchers.anyLong(), Matchers.anyLong(), Matchers.anyLong(), Matchers.anyString()))
+ .thenReturn(null);
ipTonicCmd._networkService = networkService;
@@ -97,12 +99,13 @@ public class AddIpToVmNicTest extends TestCase {
}
@Test
- public void testRemoveIpFromVmNicSuccess() throws ResourceAllocationException, ResourceUnavailableException, ConcurrentOperationException, InsufficientCapacityException {
+ public void testRemoveIpFromVmNicSuccess() throws ResourceAllocationException, ResourceUnavailableException, ConcurrentOperationException,
+ InsufficientCapacityException {
NetworkService networkService = Mockito.mock(NetworkService.class);
RemoveIpFromVmNicCmd removeIpFromNic = Mockito.mock(RemoveIpFromVmNicCmd.class);
- Mockito.when(networkService.releaseSecondaryIpFromNic(Mockito.anyInt())).thenReturn(true);
+ Mockito.when(networkService.releaseSecondaryIpFromNic(Matchers.anyInt())).thenReturn(true);
removeIpFromNic._networkService = networkService;
successResponseGenerator = Mockito.mock(SuccessResponse.class);
@@ -115,7 +118,7 @@ public class AddIpToVmNicTest extends TestCase {
NetworkService networkService = Mockito.mock(NetworkService.class);
RemoveIpFromVmNicCmd removeIpFromNic = Mockito.mock(RemoveIpFromVmNicCmd.class);
- Mockito.when(networkService.releaseSecondaryIpFromNic(Mockito.anyInt())).thenReturn(false);
+ Mockito.when(networkService.releaseSecondaryIpFromNic(Matchers.anyInt())).thenReturn(false);
removeIpFromNic._networkService = networkService;
successResponseGenerator = Mockito.mock(SuccessResponse.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/AddNetworkServiceProviderCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/org/apache/cloudstack/api/command/test/AddNetworkServiceProviderCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/AddNetworkServiceProviderCmdTest.java
index 5123178..8760fc8 100644
--- a/api/test/org/apache/cloudstack/api/command/test/AddNetworkServiceProviderCmdTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/AddNetworkServiceProviderCmdTest.java
@@ -22,14 +22,16 @@ import java.util.List;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.command.admin.network.AddNetworkServiceProviderCmd;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.mockito.Matchers;
import org.mockito.Mockito;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.network.AddNetworkServiceProviderCmd;
+
import com.cloud.exception.ResourceAllocationException;
import com.cloud.network.NetworkService;
import com.cloud.network.PhysicalNetworkServiceProvider;
@@ -41,6 +43,7 @@ public class AddNetworkServiceProviderCmdTest extends TestCase {
@Rule
public ExpectedException expectedException = ExpectedException.none();
+ @Override
@Before
public void setUp() {
addNetworkServiceProviderCmd = new AddNetworkServiceProviderCmd() {
@@ -67,6 +70,7 @@ public class AddNetworkServiceProviderCmdTest extends TestCase {
return lOfEnabledServices;
}
+ @Override
public Long getEntityId() {
return 2L;
}
@@ -82,7 +86,7 @@ public class AddNetworkServiceProviderCmdTest extends TestCase {
addNetworkServiceProviderCmd._networkService = networkService;
PhysicalNetworkServiceProvider physicalNetworkServiceProvider = Mockito.mock(PhysicalNetworkServiceProvider.class);
- Mockito.when(networkService.addProviderToPhysicalNetwork(Mockito.anyLong(), Mockito.anyString(), Mockito.anyLong(), Mockito.anyList())).thenReturn(
+ Mockito.when(networkService.addProviderToPhysicalNetwork(Matchers.anyLong(), Matchers.anyString(), Matchers.anyLong(), Matchers.anyList())).thenReturn(
physicalNetworkServiceProvider);
try {
@@ -99,7 +103,7 @@ public class AddNetworkServiceProviderCmdTest extends TestCase {
NetworkService networkService = Mockito.mock(NetworkService.class);
addNetworkServiceProviderCmd._networkService = networkService;
- Mockito.when(networkService.addProviderToPhysicalNetwork(Mockito.anyLong(), Mockito.anyString(), Mockito.anyLong(), Mockito.anyList())).thenReturn(null);
+ Mockito.when(networkService.addProviderToPhysicalNetwork(Matchers.anyLong(), Matchers.anyString(), Matchers.anyLong(), Matchers.anyList())).thenReturn(null);
try {
addNetworkServiceProviderCmd.create();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java
index 88b1747..d0b2d85 100644
--- a/api/test/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java
@@ -19,17 +19,17 @@ package org.apache.cloudstack.api.command.test;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.cloudstack.api.ResponseGenerator;
-import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.command.admin.storage.AddImageStoreCmd;
-import org.apache.cloudstack.api.response.HostResponse;
-import org.apache.cloudstack.api.response.ImageStoreResponse;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.mockito.Mockito;
+import org.apache.cloudstack.api.ResponseGenerator;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.storage.AddImageStoreCmd;
+import org.apache.cloudstack.api.response.ImageStoreResponse;
+
import com.cloud.storage.ImageStore;
import com.cloud.storage.StorageService;