Broke up some long strings
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 @@
     Host.Type _type;
     boolean _negative;
     IAgentControl _agentControl;
-    private Map<String, Object> _params;
+    Map<String, Object> _params;
 
     @Override
     public void disconnected() {
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 @@
     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;
 
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 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) {
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 @@
      * @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;
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 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 @@
     /**
      * 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;
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.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 @@
      * @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);
 
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 @@
     @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 @@
 
         response.setResponses(vlanResponses, vlans.second());
         response.setResponseName(getCommandName());
-        this.setResponseObject(response);
+        setResponseObject(response);
     }
 }
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 @@
                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 @@
             }
             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());
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 @@
     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 @@
 
     @Override
     public String getObjectId() {
-        return this.getId();
+        return getId();
     }
 
     public String getId() {
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 @@
     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 @@
         _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 @@
                 }
             }
 
+            @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 @@
                 }
             }
 
+            @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 @@
         _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 @@
                 }
             }
 
+            @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 @@
                 }
             }
 
+            @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 @@
         _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 @@
                 }
             }
 
+            @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 @@
                 }
             }
 
+            @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 @@
         _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 @@
                 }
             }
 
+            @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 @@
                 }
             }
 
+            @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 @@
         _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 @@
                 }
             }
 
+            @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 @@
                 }
             }
 
+            @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 @@
         _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 @@
                 }
             }
 
+            @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 @@
                 }
             }
 
+            @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 @@
         _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 @@
                 }
             }
 
+            @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 @@
                 }
             }
 
+            @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 @@
         _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 @@
                 }
             }
 
+            @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 @@
                 }
             }
 
+            @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 @@
         _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 @@
                 }
             }
 
+            @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 @@
                 }
             }
 
+            @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 @@
         _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 @@
                 }
             }
 
+            @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 @@
                 }
             }
 
+            @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 @@
         _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 @@
                 }
             }
 
+            @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 @@
                 }
             }
 
+            @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 @@
         _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 @@
                 }
             }
 
+            @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 @@
                 }
             }
 
+            @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 @@
         _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 @@
                 }
             }
 
+            @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 @@
                 }
             }
 
+            @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 @@
         _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 @@
                 }
             }
 
+            @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 @@
                 }
             }
 
+            @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 @@
         _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 @@
                 }
             }
 
+            @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 @@
                 }
             }
 
+            @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 @@
         _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 @@
                 }
             }
 
+            @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 @@
                 }
             }
 
+            @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 @@
         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 @@
 
             }
 
-            this.localAWSAccessKeyId = param;
+            localAWSAccessKeyId = param;
 
         }
 
@@ -4043,7 +4107,7 @@
 
             }
 
-            this.localTimestamp = param;
+            localTimestamp = param;
 
         }
 
@@ -4081,7 +4145,7 @@
 
             }
 
-            this.localSignature = param;
+            localSignature = param;
 
         }
 
@@ -4111,6 +4175,7 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 void setName(java.lang.String param) {
 
-            this.localName = param;
+            localName = param;
 
         }
 
@@ -4621,7 +4689,7 @@
            */
         public void setCreationDate(java.util.Calendar param) {
 
-            this.localCreationDate = param;
+            localCreationDate = param;
 
         }
 
@@ -4651,6 +4719,7 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 @@
 
             }
 
-            this.localMetadata = param;
+            localMetadata = param;
         }
 
         /**
@@ -5117,7 +5189,7 @@
 
             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 void setName(java.lang.String param) {
 
-            this.localName = param;
+            localName = param;
 
         }
 
@@ -5165,7 +5237,7 @@
            */
         public void setPrefix(java.lang.String param) {
 
-            this.localPrefix = param;
+            localPrefix = param;
 
         }
 
@@ -5189,7 +5261,7 @@
            */
         public void setMarker(java.lang.String param) {
 
-            this.localMarker = param;
+            localMarker = param;
 
         }
 
@@ -5227,7 +5299,7 @@
 
             }
 
-            this.localNextMarker = param;
+            localNextMarker = param;
 
         }
 
@@ -5251,7 +5323,7 @@
            */
         public void setMaxKeys(int param) {
 
-            this.localMaxKeys = param;
+            localMaxKeys = param;
 
         }
 
@@ -5289,7 +5361,7 @@
 
             }
 
-            this.localDelimiter = param;
+            localDelimiter = param;
 
         }
 
@@ -5313,7 +5385,7 @@
            */
         public void setIsTruncated(boolean param) {
 
-            this.localIsTruncated = param;
+            localIsTruncated = param;
 
         }
 
@@ -5361,7 +5433,7 @@
 
             }
 
-            this.localContents = param;
+            localContents = param;
         }
 
         /**
@@ -5378,7 +5450,7 @@
 
             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 @@
 
             }
 
-            this.localCommonPrefixes = param;
+            localCommonPrefixes = param;
         }
 
         /**
@@ -5443,7 +5515,7 @@
 
             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 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 void setBucket(java.lang.String param) {
 
-            this.localBucket = param;
+            localBucket = param;
 
         }
 
@@ -6438,7 +6514,7 @@
            */
         public void setKey(java.lang.String param) {
 
-            this.localKey = param;
+            localKey = param;
 
         }
 
@@ -6476,7 +6552,7 @@
 
             }
 
-            this.localAWSAccessKeyId = param;
+            localAWSAccessKeyId = param;
 
         }
 
@@ -6514,7 +6590,7 @@
 
             }
 
-            this.localTimestamp = param;
+            localTimestamp = param;
 
         }
 
@@ -6552,7 +6628,7 @@
 
             }
 
-            this.localSignature = param;
+            localSignature = param;
 
         }
 
@@ -6590,7 +6666,7 @@
 
             }
 
-            this.localCredential = param;
+            localCredential = param;
 
         }
 
@@ -6620,6 +6696,7 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 @@
 
             }
 
-            this.localBucket = param;
+            localBucket = param;
         }
 
         /**
@@ -7321,7 +7401,7 @@
 
             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 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 void setBucket(java.lang.String param) {
 
-            this.localBucket = param;
+            localBucket = param;
 
         }
 
@@ -7763,7 +7847,7 @@
            */
         public void setKey(java.lang.String param) {
 
-            this.localKey = param;
+            localKey = param;
 
         }
 
@@ -7815,7 +7899,7 @@
 
             }
 
-            this.localMetadata = param;
+            localMetadata = param;
         }
 
         /**
@@ -7832,7 +7916,7 @@
 
             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 void setData(javax.activation.DataHandler param) {
 
-            this.localData = param;
+            localData = param;
 
         }
 
@@ -7880,7 +7964,7 @@
            */
         public void setContentLength(long param) {
 
-            this.localContentLength = param;
+            localContentLength = param;
 
         }
 
@@ -7918,7 +8002,7 @@
 
             }
 
-            this.localAccessControlList = param;
+            localAccessControlList = param;
 
         }
 
@@ -7956,7 +8040,7 @@
 
             }
 
-            this.localStorageClass = param;
+            localStorageClass = param;
 
         }
 
@@ -7994,7 +8078,7 @@
 
             }
 
-            this.localAWSAccessKeyId = param;
+            localAWSAccessKeyId = param;
 
         }
 
@@ -8032,7 +8116,7 @@
 
             }
 
-            this.localTimestamp = param;
+            localTimestamp = param;
 
         }
 
@@ -8070,7 +8154,7 @@
 
             }
 
-            this.localSignature = param;
+            localSignature = param;
 
         }
 
@@ -8108,7 +8192,7 @@
 
             }
 
-            this.localCredential = param;
+            localCredential = param;
 
         }
 
@@ -8138,6 +8222,7 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 @@
                                     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 void setBucketName(java.lang.String param) {
 
-            this.localBucketName = param;
+            localBucketName = param;
 
         }
 
@@ -9084,6 +9173,7 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 void setCode(int param) {
 
-            this.localCode = param;
+            localCode = param;
 
         }
 
@@ -9475,7 +9568,7 @@
            */
         public void setDescription(java.lang.String param) {
 
-            this.localDescription = param;
+            localDescription = param;
 
         }
 
@@ -9505,6 +9598,7 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 void setCreateBucketReturn(CreateBucketResult param) {
 
-            this.localCreateBucketReturn = param;
+            localCreateBucketReturn = param;
 
         }
 
@@ -9950,6 +10047,7 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 void setBucket(java.lang.String param) {
 
-            this.localBucket = param;
+            localBucket = param;
 
         }
 
@@ -10309,7 +10410,7 @@
            */
         public void setKey(java.lang.String param) {
 
-            this.localKey = param;
+            localKey = param;
 
         }
 
@@ -10333,7 +10434,7 @@
            */
         public void setGetMetadata(boolean param) {
 
-            this.localGetMetadata = param;
+            localGetMetadata = param;
 
         }
 
@@ -10357,7 +10458,7 @@
            */
         public void setGetData(boolean param) {
 
-            this.localGetData = param;
+            localGetData = param;
 
         }
 
@@ -10381,7 +10482,7 @@
            */
         public void setInlineData(boolean param) {
 
-            this.localInlineData = param;
+            localInlineData = param;
 
         }
 
@@ -10420,7 +10521,7 @@
                 localByteRangeStartTracker = true;
             }
 
-            this.localByteRangeStart = param;
+            localByteRangeStart = param;
 
         }
 
@@ -10459,7 +10560,7 @@
                 localByteRangeEndTracker = true;
             }
 
-            this.localByteRangeEnd = param;
+            localByteRangeEnd = param;
 
         }
 
@@ -10497,7 +10598,7 @@
 
             }
 
-            this.localIfModifiedSince = param;
+            localIfModifiedSince = param;
 
         }
 
@@ -10535,7 +10636,7 @@
 
             }
 
-            this.localIfUnmodifiedSince = param;
+            localIfUnmodifiedSince = param;
 
         }
 
@@ -10587,7 +10688,7 @@
 
             }
 
-            this.localIfMatch = param;
+            localIfMatch = param;
         }
 
         /**
@@ -10604,7 +10705,7 @@
 
             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 @@
 
             }
 
-            this.localIfNoneMatch = param;
+            localIfNoneMatch = param;
         }
 
         /**
@@ -10673,7 +10774,7 @@
 
             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 @@
                 localReturnCompleteObjectOnConditionFailureTracker = true;
             }
 
-            this.localReturnCompleteObjectOnConditionFailure = param;
+            localReturnCompleteObjectOnConditionFailure = param;
 
         }
 
@@ -10750,7 +10851,7 @@
 
             }
 
-            this.localAWSAccessKeyId = param;
+            localAWSAccessKeyId = param;
 
         }
 
@@ -10788,7 +10889,7 @@
 
             }
 
-            this.localTimestamp = param;
+            localTimestamp = param;
 
         }
 
@@ -10826,7 +10927,7 @@
 
             }
 
-            this.localSignature = param;
+            localSignature = param;
 
         }
 
@@ -10864,7 +10965,7 @@
 
             }
 
-            this.localCredential = param;
+            localCredential = param;
 
         }
 
@@ -10894,6 +10995,7 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 void setListAllMyBucketsResponse(ListAllMyBucketsResult param) {
 
-            this.localListAllMyBucketsResponse = param;
+            localListAllMyBucketsResponse = param;
 
         }
 
@@ -12230,6 +12335,7 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 void setBucket(java.lang.String param) {
 
-            this.localBucket = param;
+            localBucket = param;
 
         }
 
@@ -12605,7 +12714,7 @@
 
             }
 
-            this.localAccessControlList = param;
+            localAccessControlList = param;
 
         }
 
@@ -12643,7 +12752,7 @@
 
             }
 
-            this.localAWSAccessKeyId = param;
+            localAWSAccessKeyId = param;
 
         }
 
@@ -12681,7 +12790,7 @@
 
             }
 
-            this.localTimestamp = param;
+            localTimestamp = param;
 
         }
 
@@ -12719,7 +12828,7 @@
 
             }
 
-            this.localSignature = param;
+            localSignature = param;
 
         }
 
@@ -12757,7 +12866,7 @@
 
             }
 
-            this.localCredential = param;
+            localCredential = param;
 
         }
 
@@ -12787,6 +12896,7 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 void setGetObjectAccessControlPolicyResponse(AccessControlPolicy param) {
 
-            this.localGetObjectAccessControlPolicyResponse = param;
+            localGetObjectAccessControlPolicyResponse = param;
 
         }
 
@@ -13446,6 +13559,7 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 void setDeleteObjectResponse(Status param) {
 
-            this.localDeleteObjectResponse = param;
+            localDeleteObjectResponse = param;
 
         }
 
@@ -13812,6 +13929,7 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 void setBucket(java.lang.String param) {
 
-            this.localBucket = param;
+            localBucket = param;
 
         }
 
@@ -14186,7 +14307,7 @@
 
             }
 
-            this.localAWSAccessKeyId = param;
+            localAWSAccessKeyId = param;
 
         }
 
@@ -14224,7 +14345,7 @@
 
             }
 
-            this.localTimestamp = param;
+            localTimestamp = param;
 
         }
 
@@ -14262,7 +14383,7 @@
 
             }
 
-            this.localSignature = param;
+            localSignature = param;
 
         }
 
@@ -14300,7 +14421,7 @@
 
             }
 
-            this.localCredential = param;
+            localCredential = param;
 
         }
 
@@ -14330,6 +14451,7 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 void setTargetBucket(java.lang.String param) {
 
-            this.localTargetBucket = param;
+            localTargetBucket = param;
 
         }
 
@@ -14956,7 +15081,7 @@
            */
         public void setTargetPrefix(java.lang.String param) {
 
-            this.localTargetPrefix = param;
+            localTargetPrefix = param;
 
         }
 
@@ -14994,7 +15119,7 @@
 
             }
 
-            this.localTargetGrants = param;
+            localTargetGrants = param;
 
         }
 
@@ -15024,6 +15149,7 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 void setBucket(java.lang.String param) {
 
-            this.localBucket = param;
+            localBucket = param;
 
         }
 
@@ -15666,7 +15795,7 @@
 
             }
 
-            this.localAWSAccessKeyId = param;
+            localAWSAccessKeyId = param;
 
         }
 
@@ -15704,7 +15833,7 @@
 
             }
 
-            this.localTimestamp = param;
+            localTimestamp = param;
 
         }
 
@@ -15742,7 +15871,7 @@
 
             }
 
-            this.localSignature = param;
+            localSignature = param;
 
         }
 
@@ -15780,7 +15909,7 @@
 
             }
 
-            this.localCredential = param;
+            localCredential = param;
 
         }
 
@@ -15810,6 +15939,7 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 void setDeleteBucketResponse(Status param) {
 
-            this.localDeleteBucketResponse = param;
+            localDeleteBucketResponse = param;
 
         }
 
@@ -16439,6 +16572,7 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 void setLastModified(java.util.Calendar param) {
 
-            this.localLastModified = param;
+            localLastModified = param;
 
         }
 
@@ -16801,7 +16938,7 @@
            */
         public void setETag(java.lang.String param) {
 
-            this.localETag = param;
+            localETag = param;
 
         }
 
@@ -16831,6 +16968,7 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 void setKey(java.lang.String param) {
 
-            this.localKey = param;
+            localKey = param;
 
         }
 
@@ -17280,7 +17421,7 @@
            */
         public void setLastModified(java.util.Calendar param) {
 
-            this.localLastModified = param;
+            localLastModified = param;
 
         }
 
@@ -17304,7 +17445,7 @@
            */
         public void setETag(java.lang.String param) {
 
-            this.localETag = param;
+            localETag = param;
 
         }
 
@@ -17328,7 +17469,7 @@
            */
         public void setSize(long param) {
 
-            this.localSize = param;
+            localSize = param;
 
         }
 
@@ -17366,7 +17507,7 @@
 
             }
 
-            this.localOwner = param;
+            localOwner = param;
 
         }
 
@@ -17390,7 +17531,7 @@
            */
         public void setStorageClass(StorageClass param) {
 
-            this.localStorageClass = param;
+            localStorageClass = param;
 
         }
 
@@ -17420,6 +17561,7 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 @@
             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 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 @@
 
             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 @@
 
         }
 
+        @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 @@
         * 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 void setOwner(CanonicalUser param) {
 
-            this.localOwner = param;
+            localOwner = param;
 
         }
 
@@ -18746,7 +18902,7 @@
            */
         public void setBuckets(ListAllMyBucketsList param) {
 
-            this.localBuckets = param;
+            localBuckets = param;
 
         }
 
@@ -18776,6 +18932,7 @@
 
             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 @@
 
         }
 
+        @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 {
@@ -18983,6 +19142,7 @@
         * 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();
@@ -19138,7 +19298,7 @@
            */
         public void setSourceBucket(java.lang.String param) {
 
-            this.localSourceBucket = param;
+            localSourceBucket = param;
 
         }
 
@@ -19162,7 +19322,7 @@
            */
         public void setSourceKey(java.lang.String param) {
 
-            this.localSourceKey = param;
+            localSourceKey = param;
 
         }
 
@@ -19186,7 +19346,7 @@
            */
         public void setDestinationBucket(java.lang.String param) {
 
-            this.localDestinationBucket = param;
+            localDestinationBucket = param;
 
         }
 
@@ -19210,7 +19370,7 @@
            */
         public void setDestinationKey(java.lang.String param) {
 
-            this.localDestinationKey = param;
+            localDestinationKey = param;
 
         }
 
@@ -19248,7 +19408,7 @@
 
             }
 
-            this.localMetadataDirective = param;
+            localMetadataDirective = param;
 
         }
 
@@ -19300,7 +19460,7 @@
 
             }
 
-            this.localMetadata = param;
+            localMetadata = param;
         }
 
         /**
@@ -19317,7 +19477,7 @@
 
             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()]);
 
         }
 
@@ -19355,7 +19515,7 @@
 
             }
 
-            this.localAccessControlList = param;
+            localAccessControlList = param;
 
         }
 
@@ -19393,7 +19553,7 @@
 
             }
 
-            this.localCopySourceIfModifiedSince = param;
+            localCopySourceIfModifiedSince = param;
 
         }
 
@@ -19431,7 +19591,7 @@
 
             }
 
-            this.localCopySourceIfUnmodifiedSince = param;
+            localCopySourceIfUnmodifiedSince = param;
 
         }
 
@@ -19483,7 +19643,7 @@
 
             }
 
-            this.localCopySourceIfMatch = param;
+            localCopySourceIfMatch = param;
         }
 
         /**
@@ -19500,7 +19660,7 @@
 
             java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localCopySourceIfMatch);
             list.add(param);
-            this.localCopySourceIfMatch = (java.lang.String[])list.toArray(new java.lang.String[list.size()]);
+            localCopySourceIfMatch = (java.lang.String[])list.toArray(new java.lang.String[list.size()]);
 
         }
 
@@ -19552,7 +19712,7 @@
 
             }
 
-            this.localCopySourceIfNoneMatch = param;
+            localCopySourceIfNoneMatch = param;
         }
 
         /**
@@ -19569,7 +19729,7 @@
 
             java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localCopySourceIfNoneMatch);
             list.add(param);
-            this.localCopySourceIfNoneMatch = (java.lang.String[])list.toArray(new java.lang.String[list.size()]);
+            localCopySourceIfNoneMatch = (java.lang.String[])list.toArray(new java.lang.String[list.size()]);
 
         }
 
@@ -19607,7 +19767,7 @@
 
             }
 
-            this.localStorageClass = param;
+            localStorageClass = param;
 
         }
 
@@ -19645,7 +19805,7 @@
 
             }
 
-            this.localAWSAccessKeyId = param;
+            localAWSAccessKeyId = param;
 
         }
 
@@ -19683,7 +19843,7 @@
 
             }
 
-            this.localTimestamp = param;
+            localTimestamp = param;
 
         }
 
@@ -19721,7 +19881,7 @@
 
             }
 
-            this.localSignature = param;
+            localSignature = param;
 
         }
 
@@ -19759,7 +19919,7 @@
 
             }
 
-            this.localCredential = param;
+            localCredential = param;
 
         }
 
@@ -19789,6 +19949,7 @@
 
             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 {
                     CopyObject.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -19797,12 +19958,14 @@
 
         }
 
+        @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 {
@@ -20433,6 +20596,7 @@
         * 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();
@@ -21085,7 +21249,7 @@
 
             }
 
-            this.localLoggingEnabled = param;
+            localLoggingEnabled = param;
 
         }
 
@@ -21115,6 +21279,7 @@
 
             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 {
                     BucketLoggingStatus.this.serialize(parentQName, factory, xmlWriter);
                 }
@@ -21123,12 +21288,14 @@
 
         }
 
+        @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 {
@@ -21317,6 +21484,7 @@
         * 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();
@@ -21450,7 +21618,7 @@
            */
         public void setBucket(java.lang.String param) {
 
-            this.localBucket = param;
+            localBucket = param;
 
         }
 
@@ -21474,7 +21642,7 @@
            */
         public void setKey(java.lang.String param) {
 
-            this.localKey = param;
+            localKey = param;
 
         }
 
@@ -21526,7 +21694,7 @@
 
             }
 
-            this.localMetadata = param;
+            localMetadata = param;
         }
 
         /**
@@ -21543,7 +21711,7 @@
 
             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()]);
 
         }
 
@@ -21567,7 +21735,7 @@
            */
         public void setContentLength(long param) {
 
-            this.localContentLength = param;
+            localContentLength = param;
 
         }
 
@@ -21605,7 +21773,7 @@
 
             }
 
-            this.localAccessControlList = param;
+            localAccessControlList = param;
 
         }
 
@@ -21643,7 +21811,7 @@
 
             }
 
-            this.localStorageClass = param;
+            localStorageClass = param;
 
         }
 
@@ -21681,7 +21849,7 @@
 
             }
 
-            this.localAWSAccessKeyId = param;
+            localAWSAccessKeyId = param;
 
         }
 
@@ -21719,7 +21887,7 @@
 
             }
 
-            this.localTimestamp = param;
+            localTimestamp = param;
 
         }
 
@@ -21757,7 +21925,7 @@
 
             }
 
-            this.localSignature = param;
+            localSignature = param;
 
         }
 
@@ -21795,7 +21963,7 @@
 
             }
 
-            this.localCredential = param;
+            localCredential = param;
 
         }
 
@@ -21825,6 +21993,7 @@
 
             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 {
                     PutObject.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -21833,12 +22002,14 @@
 
         }
 
+        @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 {
@@ -22275,6 +22446,7 @@
         * 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();
@@ -22683,14 +22855,17 @@
             return localMetadataDirective;
         }
 
+        @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 localMetadataDirective.toString();
@@ -22723,6 +22898,7 @@
 
             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 {
                     MetadataDirective.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -22731,12 +22907,14 @@
 
         }
 
+        @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 {
@@ -22929,6 +23107,7 @@
         * 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
@@ -23089,7 +23268,7 @@
 
             }
 
-            this.localMetadata = param;
+            localMetadata = param;
         }
 
         /**
@@ -23106,7 +23285,7 @@
 
             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()]);
 
         }
 
@@ -23130,7 +23309,7 @@
            */
         public void setData(javax.activation.DataHandler param) {
 
-            this.localData = param;
+            localData = param;
 
         }
 
@@ -23154,7 +23333,7 @@
            */
         public void setLastModified(java.util.Calendar param) {
 
-            this.localLastModified = param;
+            localLastModified = param;
 
         }
 
@@ -23178,7 +23357,7 @@
            */
         public void setETag(java.lang.String param) {
 
-            this.localETag = param;
+            localETag = param;
 
         }
 
@@ -23203,11 +23382,13 @@
         * @param factory
         * @return org.apache.axiom.om.OMElement
         */
+        @Override
         public org.apache.axiom.om.OMElement getOMElement(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory)
             throws org.apache.axis2.databinding.ADBException {
 
             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 {
                     GetObjectResult.this.serialize(parentQName, factory, xmlWriter);
                 }
@@ -23216,12 +23397,14 @@
 
         }
 
+        @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 {
@@ -23512,6 +23695,7 @@
         * 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();
@@ -23807,7 +23991,7 @@
            */
         public void setGrantee(Grantee param) {
 
-            this.localGrantee = param;
+            localGrantee = param;
 
         }
 
@@ -23831,7 +24015,7 @@
            */
         public void setPermission(Permission param) {
 
-            this.localPermission = param;
+            localPermission = param;
 
         }
 
@@ -23861,6 +24045,7 @@
 
             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 {
                     Grant.this.serialize(parentQName, factory, xmlWriter);
                 }
@@ -23869,12 +24054,14 @@
 
         }
 
+        @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 {
@@ -24068,6 +24255,7 @@
         * 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();
@@ -24224,7 +24412,7 @@
            */
         public void setGetBucketAccessControlPolicyResponse(AccessControlPolicy param) {
 
-            this.localGetBucketAccessControlPolicyResponse = param;
+            localGetBucketAccessControlPolicyResponse = param;
 
         }
 
@@ -24254,6 +24442,7 @@
 
             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 {
                     GetBucketAccessControlPolicyResponse.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -24262,12 +24451,14 @@
 
         }
 
+        @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 {
@@ -24457,6 +24648,7 @@
         * 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();
@@ -24597,6 +24789,7 @@
 
             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 {
                     SetObjectAccessControlPolicyResponse.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -24605,12 +24798,14 @@
 
         }
 
+        @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 {
@@ -24794,6 +24989,7 @@
         * 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();
@@ -24904,7 +25100,7 @@
            */
         public void setBucket(java.lang.String param) {
 
-            this.localBucket = param;
+            localBucket = param;
 
         }
 
@@ -24928,7 +25124,7 @@
            */
         public void setKey(java.lang.String param) {
 
-            this.localKey = param;
+            localKey = param;
 
         }
 
@@ -24952,7 +25148,7 @@
            */
         public void setAccessControlList(AccessControlList param) {
 
-            this.localAccessControlList = param;
+            localAccessControlList = param;
 
         }
 
@@ -24990,7 +25186,7 @@
 
             }
 
-            this.localAWSAccessKeyId = param;
+            localAWSAccessKeyId = param;
 
         }
 
@@ -25028,7 +25224,7 @@
 
             }
 
-            this.localTimestamp = param;
+            localTimestamp = param;
 
         }
 
@@ -25066,7 +25262,7 @@
 
             }
 
-            this.localSignature = param;
+            localSignature = param;
 
         }
 
@@ -25104,7 +25300,7 @@
 
             }
 
-            this.localCredential = param;
+            localCredential = param;
 
         }
 
@@ -25134,6 +25330,7 @@
 
             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 {
                     SetObjectAccessControlPolicy.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -25142,12 +25339,14 @@
 
         }
 
+        @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 {
@@ -25531,6 +25730,7 @@
         * 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();
@@ -25819,7 +26019,7 @@
            */
         public void setBucket(java.lang.String param) {
 
-            this.localBucket = param;
+            localBucket = param;
 
         }
 
@@ -25857,7 +26057,7 @@
 
             }
 
-            this.localPrefix = param;
+            localPrefix = param;
 
         }
 
@@ -25895,7 +26095,7 @@
 
             }
 
-            this.localMarker = param;
+            localMarker = param;
 
         }
 
@@ -25934,7 +26134,7 @@
                 localMaxKeysTracker = true;
             }
 
-            this.localMaxKeys = param;
+            localMaxKeys = param;
 
         }
 
@@ -25972,7 +26172,7 @@
 
             }
 
-            this.localDelimiter = param;
+            localDelimiter = param;
 
         }
 
@@ -26010,7 +26210,7 @@
 
             }
 
-            this.localAWSAccessKeyId = param;
+            localAWSAccessKeyId = param;
 
         }
 
@@ -26048,7 +26248,7 @@
 
             }
 
-            this.localTimestamp = param;
+            localTimestamp = param;
 
         }
 
@@ -26086,7 +26286,7 @@
 
             }
 
-            this.localSignature = param;
+            localSignature = param;
 
         }
 
@@ -26124,7 +26324,7 @@
 
             }
 
-            this.localCredential = param;
+            localCredential = param;
 
         }
 
@@ -26154,6 +26354,7 @@
 
             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 {
                     ListBucket.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -26162,12 +26363,14 @@
 
         }
 
+        @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 {
@@ -26643,6 +26846,7 @@
         * 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();
@@ -26987,7 +27191,7 @@
            */
         public void setName(java.lang.String param) {
 
-            this.localName = param;
+            localName = param;
 
         }
 
@@ -27011,7 +27215,7 @@
            */
         public void setValue(java.lang.String param) {
 
-            this.localValue = param;
+            localValue = param;
 
         }
 
@@ -27041,6 +27245,7 @@
 
             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 {
                     MetadataEntry.this.serialize(parentQName, factory, xmlWriter);
                 }
@@ -27049,12 +27254,14 @@
 
         }
 
+        @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 {
@@ -27302,6 +27509,7 @@
         * 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();
@@ -27464,7 +27672,7 @@
            */
         public void setBucket(java.lang.String param) {
 
-            this.localBucket = param;
+            localBucket = param;
 
         }
 
@@ -27502,7 +27710,7 @@
 
             }
 
-            this.localAWSAccessKeyId = param;
+            localAWSAccessKeyId = param;
 
         }
 
@@ -27540,7 +27748,7 @@
 
             }
 
-            this.localTimestamp = param;
+            localTimestamp = param;
 
         }
 
@@ -27578,7 +27786,7 @@
 
             }
 
-            this.localSignature = param;
+            localSignature = param;
 
         }
 
@@ -27616,7 +27824,7 @@
 
             }
 
-            this.localCredential = param;
+            localCredential = param;
 
         }
 
@@ -27646,6 +27854,7 @@
 
             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 {
                     GetBucketAccessControlPolicy.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -27654,12 +27863,14 @@
 
         }
 
+        @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 {
@@ -28006,6 +28217,7 @@
         * 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();
@@ -28246,7 +28458,7 @@
            */
         public void setGetObjectResponse(GetObjectResult param) {
 
-            this.localGetObjectResponse = param;
+            localGetObjectResponse = param;
 
         }
 
@@ -28276,6 +28488,7 @@
 
             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 {
                     GetObjectExtendedResponse.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -28284,12 +28497,14 @@
 
         }
 
+        @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 {
@@ -28478,6 +28693,7 @@
         * 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();
@@ -28622,14 +28838,17 @@
             return localStorageClass;
         }
 
+        @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 localStorageClass.toString();
@@ -28662,6 +28881,7 @@
 
             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 {
                     StorageClass.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -28670,12 +28890,14 @@
 
         }
 
+        @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 {
@@ -28868,6 +29090,7 @@
         * 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
@@ -29004,7 +29227,7 @@
            */
         public void setETag(java.lang.String param) {
 
-            this.localETag = param;
+            localETag = param;
 
         }
 
@@ -29028,7 +29251,7 @@
            */
         public void setLastModified(java.util.Calendar param) {
 
-            this.localLastModified = param;
+            localLastModified = param;
 
         }
 
@@ -29058,6 +29281,7 @@
 
             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 {
                     PutObjectResult.this.serialize(parentQName, factory, xmlWriter);
                 }
@@ -29066,12 +29290,14 @@
 
         }
 
+        @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 {
@@ -29319,6 +29545,7 @@
         * 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();
@@ -29511,7 +29738,7 @@
 
             }
 
-            this.localGrant = param;
+            localGrant = param;
         }
 
         /**
@@ -29528,7 +29755,7 @@
 
             java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localGrant);
             list.add(param);
-            this.localGrant = (Grant[])list.toArray(new Grant[list.size()]);
+            localGrant = (Grant[])list.toArray(new Grant[list.size()]);
 
         }
 
@@ -29558,6 +29785,7 @@
 
             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 {
                     AccessControlList.this.serialize(parentQName, factory, xmlWriter);
                 }
@@ -29566,12 +29794,14 @@
 
         }
 
+        @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 {
@@ -29772,6 +30002,7 @@
         * 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();
@@ -29946,7 +30177,7 @@
            */
         public void setListBucketResponse(ListBucketResult param) {
 
-            this.localListBucketResponse = param;
+            localListBucketResponse = param;
 
         }
 
@@ -29976,6 +30207,7 @@
 
             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 {
                     ListBucketResponse.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -29984,12 +30216,14 @@
 
         }
 
+        @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 {
@@ -30178,6 +30412,7 @@
         * 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();
@@ -30314,7 +30549,7 @@
            */
         public void setOwner(CanonicalUser param) {
 
-            this.localOwner = param;
+            localOwner = param;
 
         }
 
@@ -30338,7 +30573,7 @@
            */
         public void setAccessControlList(AccessControlList param) {
 
-            this.localAccessControlList = param;
+            localAccessControlList = param;
 
         }
 
@@ -30368,6 +30603,7 @@
 
             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 {
                     AccessControlPolicy.this.serialize(parentQName, factory, xmlWriter);
                 }
@@ -30376,12 +30612,14 @@
 
         }
 
+        @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 {
@@ -30575,6 +30813,7 @@
         * 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();
@@ -30733,7 +30972,7 @@
            */
         public void setPrefix(java.lang.String param) {
 
-            this.localPrefix = param;
+            localPrefix = param;
 
         }
 
@@ -30763,6 +31002,7 @@
 
             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 {
                     PrefixEntry.this.serialize(parentQName, factory, xmlWriter);
                 }
@@ -30771,12 +31011,14 @@
 
         }
 
+        @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 {
@@ -30992,6 +31234,7 @@
         * 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();
@@ -31128,7 +31371,7 @@
            */
         public void setBucket(java.lang.String param) {
 
-            this.localBucket = param;
+            localBucket = param;
 
         }
 
@@ -31152,7 +31395,7 @@
            */
         public void setKey(java.lang.String param) {
 
-            this.localKey = param;
+            localKey = param;
 
         }
 
@@ -31190,7 +31433,7 @@
 
             }
 
-            this.localAWSAccessKeyId = param;
+            localAWSAccessKeyId = param;
 
         }
 
@@ -31228,7 +31471,7 @@
 
             }
 
-            this.localTimestamp = param;
+            localTimestamp = param;
 
         }
 
@@ -31266,7 +31509,7 @@
 
             }
 
-            this.localSignature = param;
+            localSignature = param;
 
         }
 
@@ -31304,7 +31547,7 @@
 
             }
 
-            this.localCredential = param;
+            localCredential = param;
 
         }
 
@@ -31334,6 +31577,7 @@
 
             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 {
                     GetObjectAccessControlPolicy.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -31342,12 +31586,14 @@
 
         }
 
+        @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 {
@@ -31726,6 +31972,7 @@
         * 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();
@@ -31991,7 +32238,7 @@
            */
         public void setBucket(java.lang.String param) {
 
-            this.localBucket = param;
+            localBucket = param;
 
         }
 
@@ -32015,7 +32262,7 @@
            */
         public void setKey(java.lang.String param) {
 
-            this.localKey = param;
+            localKey = param;
 
         }
 
@@ -32039,7 +32286,7 @@
            */
         public void setGetMetadata(boolean param) {
 
-            this.localGetMetadata = param;
+            localGetMetadata = param;
 
         }
 
@@ -32063,7 +32310,7 @@
            */
         public void setGetData(boolean param) {
 
-            this.localGetData = param;
+            localGetData = param;
 
         }
 
@@ -32087,7 +32334,7 @@
            */
         public void setInlineData(boolean param) {
 
-            this.localInlineData = param;
+            localInlineData = param;
 
         }
 
@@ -32125,7 +32372,7 @@
 
             }
 
-            this.localAWSAccessKeyId = param;
+            localAWSAccessKeyId = param;
 
         }
 
@@ -32163,7 +32410,7 @@
 
             }
 
-            this.localTimestamp = param;
+            localTimestamp = param;
 
         }
 
@@ -32201,7 +32448,7 @@
 
             }
 
-            this.localSignature = param;
+            localSignature = param;
 
         }
 
@@ -32239,7 +32486,7 @@
 
             }
 
-            this.localCredential = param;
+            localCredential = param;
 
         }
 
@@ -32269,6 +32516,7 @@
 
             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 {
                     GetObject.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -32277,12 +32525,14 @@
 
         }
 
+        @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 {
@@ -32748,6 +32998,7 @@
         * 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();
@@ -33082,7 +33333,7 @@
            */
         public void setID(java.lang.String param) {
 
-            this.localID = param;
+            localID = param;
 
         }
 
@@ -33120,7 +33371,7 @@
 
             }
 
-            this.localDisplayName = param;
+            localDisplayName = param;
 
         }
 
@@ -33145,11 +33396,13 @@
         * @param factory
         * @return org.apache.axiom.om.OMElement
         */
+        @Override
         public org.apache.axiom.om.OMElement getOMElement(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory)
             throws org.apache.axis2.databinding.ADBException {
 
             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 {
                     CanonicalUser.this.serialize(parentQName, factory, xmlWriter);
                 }
@@ -33158,12 +33411,14 @@
 
         }
 
+        @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 {
@@ -33407,6 +33662,7 @@
         * 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();
@@ -33572,7 +33828,7 @@
            */
         public void setGetBucketLoggingStatusResponse(BucketLoggingStatus param) {
 
-            this.localGetBucketLoggingStatusResponse = param;
+            localGetBucketLoggingStatusResponse = param;
 
         }
 
@@ -33602,6 +33858,7 @@
 
             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 {
                     GetBucketLoggingStatusResponse.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -33610,12 +33867,14 @@
 
         }
 
+        @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 {
@@ -33805,6 +34064,7 @@
         * 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();
@@ -33941,7 +34201,7 @@
            */
         public void setStatus(Status param) {
 
-            this.localStatus = param;
+            localStatus = param;
 
         }
 
@@ -33971,6 +34231,7 @@
 
             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 {
                     Result.this.serialize(parentQName, factory, xmlWriter);
                 }
@@ -33979,12 +34240,14 @@
 
         }
 
+        @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 {
@@ -34173,6 +34436,7 @@
         * 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();
@@ -34305,7 +34569,7 @@
            */
         public void setCopyObjectResult(CopyObjectResult param) {
 
-            this.localCopyObjectResult = param;
+            localCopyObjectResult = param;
 
         }
 
@@ -34335,6 +34599,7 @@
 
             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 {
                     CopyObjectResponse.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -34343,12 +34608,14 @@
 
         }
 
+        @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 {
@@ -34537,6 +34804,7 @@
         * 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();
@@ -34669,7 +34937,7 @@
            */
         public void setGetObjectResponse(GetObjectResult param) {
 
-            this.localGetObjectResponse = param;
+            localGetObjectResponse = param;
 
         }
 
@@ -34699,6 +34967,7 @@
 
             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 {
                     GetObjectResponse.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -34707,12 +34976,14 @@
 
         }
 
+        @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 {
@@ -34901,6 +35172,7 @@
         * 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();
@@ -35034,7 +35306,7 @@
            */
         public void setPutObjectInlineResponse(PutObjectResult param) {
 
-            this.localPutObjectInlineResponse = param;
+            localPutObjectInlineResponse = param;
 
         }
 
@@ -35064,6 +35336,7 @@
 
             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 {
                     PutObjectInlineResponse.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -35072,12 +35345,14 @@
 
         }
 
+        @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 {
@@ -35267,6 +35542,7 @@
         * 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();
@@ -35400,7 +35676,7 @@
            */
         public void setBucket(java.lang.String param) {
 
-            this.localBucket = param;
+            localBucket = param;
 
         }
 
@@ -35438,7 +35714,7 @@
 
             }
 
-            this.localAccessControlList = param;
+            localAccessControlList = param;
 
         }
 
@@ -35476,7 +35752,7 @@
 
             }
 
-            this.localAWSAccessKeyId = param;
+            localAWSAccessKeyId = param;
 
         }
 
@@ -35514,7 +35790,7 @@
 
             }
 
-            this.localTimestamp = param;
+            localTimestamp = param;
 
         }
 
@@ -35552,7 +35828,7 @@
 
             }
 
-            this.localSignature = param;
+            localSignature = param;
 
         }
 
@@ -35582,6 +35858,7 @@
 
             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 {
                     CreateBucket.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -35590,12 +35867,14 @@
 
         }
 
+        @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 {
@@ -35915,6 +36194,7 @@
         * 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();
@@ -36151,7 +36431,7 @@
            */
         public void setPutObjectResponse(PutObjectResult param) {
 
-            this.localPutObjectResponse = param;
+            localPutObjectResponse = param;
 
         }
 
@@ -36181,6 +36461,7 @@
 
             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 {
                     PutObjectResponse.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -36189,12 +36470,14 @@
 
         }
 
+        @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 {
@@ -36383,6 +36666,7 @@
         * 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();
@@ -36515,7 +36799,7 @@
            */
         public void setLocation(org.apache.axis2.databinding.types.URI param) {
 
-            this.localLocation = param;
+            localLocation = param;
 
         }
 
@@ -36539,7 +36823,7 @@
            */
         public void setBucket(java.lang.String param) {
 
-            this.localBucket = param;
+            localBucket = param;
 
         }
 
@@ -36563,7 +36847,7 @@
            */
         public void setKey(java.lang.String param) {
 
-            this.localKey = param;
+            localKey = param;
 
         }
 
@@ -36587,7 +36871,7 @@
            */
         public void setETag(java.lang.String param) {
 
-            this.localETag = param;
+            localETag = param;
 
         }
 
@@ -36617,6 +36901,7 @@
 
             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 {
                     PostResponse.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -36625,12 +36910,14 @@
 
         }
 
+        @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 {
@@ -36942,6 +37229,7 @@
         * 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();
@@ -37162,6 +37450,7 @@
 
             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 {
                     SetBucketAccessControlPolicyResponse.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -37170,12 +37459,14 @@
 
         }
 
+        @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 {
@@ -37359,6 +37650,7 @@
         * 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();
@@ -37475,6 +37767,7 @@
 
             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 {
                     SetBucketLoggingStatusResponse.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -37483,12 +37776,14 @@
 
         }
 
+        @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 {
@@ -37672,6 +37967,7 @@
         * 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();
@@ -37785,11 +38081,13 @@
         * @param factory
         * @return org.apache.axiom.om.OMElement
         */
+        @Override
         public org.apache.axiom.om.OMElement getOMElement(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory)
             throws org.apache.axis2.databinding.ADBException {
 
             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 {
                     User.this.serialize(parentQName, factory, xmlWriter);
                 }
@@ -37798,12 +38096,14 @@
 
         }
 
+        @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 {
@@ -37983,6 +38283,7 @@
         * 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();
@@ -38091,7 +38392,7 @@
            */
         public void setBucket(java.lang.String param) {
 
-            this.localBucket = param;
+            localBucket = param;
 
         }
 
@@ -38129,7 +38430,7 @@
 
             }
 
-            this.localAWSAccessKeyId = param;
+            localAWSAccessKeyId = param;
 
         }
 
@@ -38167,7 +38468,7 @@
 
             }
 
-            this.localTimestamp = param;
+            localTimestamp = param;
 
         }
 
@@ -38205,7 +38506,7 @@
 
             }
 
-            this.localSignature = param;
+            localSignature = param;
 
         }
 
@@ -38243,7 +38544,7 @@
 
             }
 
-            this.localCredential = param;
+            localCredential = param;
 
         }
 
@@ -38267,7 +38568,7 @@
            */
         public void setBucketLoggingStatus(BucketLoggingStatus param) {
 
-            this.localBucketLoggingStatus = param;
+            localBucketLoggingStatus = param;
 
         }
 
@@ -38297,6 +38598,7 @@
 
             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 {
                     SetBucketLoggingStatus.this.serialize(MY_QNAME, factory, xmlWriter);
                 }
@@ -38305,12 +38607,14 @@
 
         }
 
+        @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 {
@@ -38662,6 +38966,7 @@
         * 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();
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 @@
         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()) {
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 @@
     *     */
     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 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 @@
             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) {
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 @@
     @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;
 
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 @@
         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) {
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 @@
                     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);
 
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 @@
                         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();
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 @@
                         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();
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 @@
         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 @@
                 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();
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 @@
         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 @@
                 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 @@
 
                     //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);
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 @@
             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()) {
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 @@
                     } 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");
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 @@
     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");
 
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 @@
     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() {
     }
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 @@
         "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;
 
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 @@
 
     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 ";
 
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>
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 @@
                         /* 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 ");
                             }
                         }
                     }
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 @@
                 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 @@
 
     @Inject
     public void setFirewallElements(List<FirewallServiceProvider> firewallElements) {
-        this._firewallElements = firewallElements;
+        _firewallElements = firewallElements;
     }
 
     public List<PortForwardingServiceProvider> getPfElements() {
@@ -937,7 +938,7 @@
 
     @Inject
     public void setPfElements(List<PortForwardingServiceProvider> pfElements) {
-        this._pfElements = pfElements;
+        _pfElements = pfElements;
     }
 
     public List<StaticNatServiceProvider> getStaticNatElements() {
@@ -946,7 +947,7 @@
 
     @Inject
     public void setStaticNatElements(List<StaticNatServiceProvider> staticNatElements) {
-        this._staticNatElements = staticNatElements;
+        _staticNatElements = staticNatElements;
     }
 
     public List<NetworkACLServiceProvider> getNetworkAclElements() {
@@ -955,7 +956,7 @@
 
     @Inject
     public void setNetworkAclElements(List<NetworkACLServiceProvider> networkAclElements) {
-        this._networkAclElements = networkAclElements;
+        _networkAclElements = networkAclElements;
     }
 
 }
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 @@
         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,
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 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 @@
             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 @@
                         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 @@
 //        //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);
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 @@
             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&amp;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&amp;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>