Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5224C1065A for ; Thu, 12 Dec 2013 21:01:21 +0000 (UTC) Received: (qmail 82786 invoked by uid 500); 12 Dec 2013 21:01:07 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 82309 invoked by uid 500); 12 Dec 2013 21:01:06 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 80428 invoked by uid 99); 12 Dec 2013 21:01:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Dec 2013 21:01:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6AAA58B6736; Thu, 12 Dec 2013 21:01:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ahuang@apache.org To: commits@cloudstack.apache.org Date: Thu, 12 Dec 2013 21:01:42 -0000 Message-Id: In-Reply-To: <2a0c933eb22e4c2283a6e9b4077dc085@git.apache.org> References: <2a0c933eb22e4c2283a6e9b4077dc085@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [42/48] All Checkstyle problems corrected http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/awsapi/src/com/amazon/s3/AmazonS3MessageReceiverInOut.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/s3/AmazonS3MessageReceiverInOut.java b/awsapi/src/com/amazon/s3/AmazonS3MessageReceiverInOut.java index 0e8c332..4b9c0a4 100644 --- a/awsapi/src/com/amazon/s3/AmazonS3MessageReceiverInOut.java +++ b/awsapi/src/com/amazon/s3/AmazonS3MessageReceiverInOut.java @@ -59,7 +59,7 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs getBucketLoggingStatusResponse33 = - skel.getBucketLoggingStatus(wrappedParam); + skel.getBucketLoggingStatus(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), getBucketLoggingStatusResponse33, false); } else @@ -73,7 +73,7 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs copyObjectResponse35 = - skel.copyObject(wrappedParam); + skel.copyObject(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), copyObjectResponse35, false); } else @@ -87,7 +87,7 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs getBucketAccessControlPolicyResponse37 = - skel.getBucketAccessControlPolicy(wrappedParam); + skel.getBucketAccessControlPolicy(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), getBucketAccessControlPolicyResponse37, false); } else @@ -101,7 +101,7 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs listBucketResponse39 = - skel.listBucket(wrappedParam); + skel.listBucket(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), listBucketResponse39, false); } else @@ -115,7 +115,7 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs putObjectResponse41 = - skel.putObject(wrappedParam); + skel.putObject(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), putObjectResponse41, false); } else @@ -129,7 +129,7 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs createBucketResponse43 = - skel.createBucket(wrappedParam); + skel.createBucket(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createBucketResponse43, false); } else @@ -143,7 +143,7 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs listAllMyBucketsResponse45 = - skel.listAllMyBuckets(wrappedParam); + skel.listAllMyBuckets(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), listAllMyBucketsResponse45, false); } else @@ -157,7 +157,7 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs getObjectResponse47 = - skel.getObject(wrappedParam); + skel.getObject(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), getObjectResponse47, false); } else @@ -171,7 +171,7 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs deleteBucketResponse49 = - skel.deleteBucket(wrappedParam); + skel.deleteBucket(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteBucketResponse49, false); } else @@ -185,7 +185,7 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs setBucketLoggingStatusResponse51 = - skel.setBucketLoggingStatus(wrappedParam); + skel.setBucketLoggingStatus(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), setBucketLoggingStatusResponse51, false); } else @@ -199,7 +199,7 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs getObjectAccessControlPolicyResponse53 = - skel.getObjectAccessControlPolicy(wrappedParam); + skel.getObjectAccessControlPolicy(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), getObjectAccessControlPolicyResponse53, false); } else @@ -213,7 +213,7 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs deleteObjectResponse55 = - skel.deleteObject(wrappedParam); + skel.deleteObject(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteObjectResponse55, false); } else @@ -227,7 +227,7 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs setBucketAccessControlPolicyResponse57 = - skel.setBucketAccessControlPolicy(wrappedParam); + skel.setBucketAccessControlPolicy(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), setBucketAccessControlPolicyResponse57, false); } else @@ -241,7 +241,7 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs setObjectAccessControlPolicyResponse59 = - skel.setObjectAccessControlPolicy(wrappedParam); + skel.setObjectAccessControlPolicy(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), setObjectAccessControlPolicyResponse59, false); } else @@ -255,7 +255,7 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs putObjectInlineResponse61 = - skel.putObjectInline(wrappedParam); + skel.putObjectInline(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), putObjectInlineResponse61, false); } else @@ -269,7 +269,7 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs getObjectExtendedResponse63 = - skel.getObjectExtended(wrappedParam); + skel.getObjectExtended(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), getObjectExtendedResponse63, false); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/awsapi/src/com/amazon/s3/MetadataDirective.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/s3/MetadataDirective.java b/awsapi/src/com/amazon/s3/MetadataDirective.java index b376686..a558f60 100644 --- a/awsapi/src/com/amazon/s3/MetadataDirective.java +++ b/awsapi/src/com/amazon/s3/MetadataDirective.java @@ -333,7 +333,7 @@ public class MetadataDirective implements org.apache.axis2.databinding.ADBBean { public static MetadataDirective fromValue(java.lang.String value) throws java.lang.IllegalArgumentException { MetadataDirective enumeration = (MetadataDirective) - _table_.get(value); + _table_.get(value); if (enumeration == null) throw new java.lang.IllegalArgumentException(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/awsapi/src/com/amazon/s3/MfaDeleteStatus.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/s3/MfaDeleteStatus.java b/awsapi/src/com/amazon/s3/MfaDeleteStatus.java index 63e9827..a050d8c 100644 --- a/awsapi/src/com/amazon/s3/MfaDeleteStatus.java +++ b/awsapi/src/com/amazon/s3/MfaDeleteStatus.java @@ -333,7 +333,7 @@ public class MfaDeleteStatus implements org.apache.axis2.databinding.ADBBean { public static MfaDeleteStatus fromValue(java.lang.String value) throws java.lang.IllegalArgumentException { MfaDeleteStatus enumeration = (MfaDeleteStatus) - _table_.get(value); + _table_.get(value); if (enumeration == null) throw new java.lang.IllegalArgumentException(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/awsapi/src/com/amazon/s3/Payer.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/s3/Payer.java b/awsapi/src/com/amazon/s3/Payer.java index ea33c56..61b7b7f 100644 --- a/awsapi/src/com/amazon/s3/Payer.java +++ b/awsapi/src/com/amazon/s3/Payer.java @@ -333,7 +333,7 @@ public class Payer implements org.apache.axis2.databinding.ADBBean { public static Payer fromValue(java.lang.String value) throws java.lang.IllegalArgumentException { Payer enumeration = (Payer) - _table_.get(value); + _table_.get(value); if (enumeration == null) throw new java.lang.IllegalArgumentException(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/awsapi/src/com/amazon/s3/Permission.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/s3/Permission.java b/awsapi/src/com/amazon/s3/Permission.java index 1fad5a7..736fd64 100644 --- a/awsapi/src/com/amazon/s3/Permission.java +++ b/awsapi/src/com/amazon/s3/Permission.java @@ -345,7 +345,7 @@ public class Permission implements org.apache.axis2.databinding.ADBBean { public static Permission fromValue(java.lang.String value) throws java.lang.IllegalArgumentException { Permission enumeration = (Permission) - _table_.get(value); + _table_.get(value); if (enumeration == null) throw new java.lang.IllegalArgumentException(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/awsapi/src/com/amazon/s3/StorageClass.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/s3/StorageClass.java b/awsapi/src/com/amazon/s3/StorageClass.java index 56f7eda..d10c069 100644 --- a/awsapi/src/com/amazon/s3/StorageClass.java +++ b/awsapi/src/com/amazon/s3/StorageClass.java @@ -333,7 +333,7 @@ public class StorageClass implements org.apache.axis2.databinding.ADBBean { public static StorageClass fromValue(java.lang.String value) throws java.lang.IllegalArgumentException { StorageClass enumeration = (StorageClass) - _table_.get(value); + _table_.get(value); if (enumeration == null) throw new java.lang.IllegalArgumentException(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/awsapi/src/com/amazon/s3/VersioningStatus.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/s3/VersioningStatus.java b/awsapi/src/com/amazon/s3/VersioningStatus.java index 74b3de0..c05604f 100644 --- a/awsapi/src/com/amazon/s3/VersioningStatus.java +++ b/awsapi/src/com/amazon/s3/VersioningStatus.java @@ -333,7 +333,7 @@ public class VersioningStatus implements org.apache.axis2.databinding.ADBBean { public static VersioningStatus fromValue(java.lang.String value) throws java.lang.IllegalArgumentException { VersioningStatus enumeration = (VersioningStatus) - _table_.get(value); + _table_.get(value); if (enumeration == null) throw new java.lang.IllegalArgumentException(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java b/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java index 06ba655..ad740f0 100644 --- a/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java +++ b/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java @@ -235,9 +235,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatusResponse getBucketLoggingStatus( - com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatus getBucketLoggingStatus0) + com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatus getBucketLoggingStatus0) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -335,11 +335,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startgetBucketLoggingStatus( - com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatus getBucketLoggingStatus0, + com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatus getBucketLoggingStatus0, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[0].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/GetBucketLoggingStatusRequest"); @@ -471,9 +471,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.CopyObjectResponse copyObject( - com.amazon.s3.client.AmazonS3Stub.CopyObject copyObject2) + com.amazon.s3.client.AmazonS3Stub.CopyObject copyObject2) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -571,11 +571,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startcopyObject( - com.amazon.s3.client.AmazonS3Stub.CopyObject copyObject2, + com.amazon.s3.client.AmazonS3Stub.CopyObject copyObject2, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[1].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/CopyObjectRequest"); @@ -706,9 +706,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicyResponse getBucketAccessControlPolicy( - com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicy getBucketAccessControlPolicy4) + com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicy getBucketAccessControlPolicy4) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -807,11 +807,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startgetBucketAccessControlPolicy( - com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicy getBucketAccessControlPolicy4, + com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicy getBucketAccessControlPolicy4, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[2].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/GetBucketAccessControlPolicyRequest"); @@ -943,9 +943,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.ListBucketResponse listBucket( - com.amazon.s3.client.AmazonS3Stub.ListBucket listBucket6) + com.amazon.s3.client.AmazonS3Stub.ListBucket listBucket6) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -1043,11 +1043,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startlistBucket( - com.amazon.s3.client.AmazonS3Stub.ListBucket listBucket6, + com.amazon.s3.client.AmazonS3Stub.ListBucket listBucket6, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[3].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/ListBucketRequest"); @@ -1178,9 +1178,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.PutObjectResponse putObject( - com.amazon.s3.client.AmazonS3Stub.PutObject putObject8) + com.amazon.s3.client.AmazonS3Stub.PutObject putObject8) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -1278,11 +1278,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startputObject( - com.amazon.s3.client.AmazonS3Stub.PutObject putObject8, + com.amazon.s3.client.AmazonS3Stub.PutObject putObject8, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[4].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/PutObjectRequest"); @@ -1413,9 +1413,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.CreateBucketResponse createBucket( - com.amazon.s3.client.AmazonS3Stub.CreateBucket createBucket10) + com.amazon.s3.client.AmazonS3Stub.CreateBucket createBucket10) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -1513,11 +1513,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startcreateBucket( - com.amazon.s3.client.AmazonS3Stub.CreateBucket createBucket10, + com.amazon.s3.client.AmazonS3Stub.CreateBucket createBucket10, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[5].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/CreateBucketRequest"); @@ -1648,9 +1648,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.ListAllMyBucketsResponse listAllMyBuckets( - com.amazon.s3.client.AmazonS3Stub.ListAllMyBuckets listAllMyBuckets12) + com.amazon.s3.client.AmazonS3Stub.ListAllMyBuckets listAllMyBuckets12) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -1748,11 +1748,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startlistAllMyBuckets( - com.amazon.s3.client.AmazonS3Stub.ListAllMyBuckets listAllMyBuckets12, + com.amazon.s3.client.AmazonS3Stub.ListAllMyBuckets listAllMyBuckets12, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[6].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/ListAllMyBucketsRequest"); @@ -1883,9 +1883,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.GetObjectResponse getObject( - com.amazon.s3.client.AmazonS3Stub.GetObject getObject14) + com.amazon.s3.client.AmazonS3Stub.GetObject getObject14) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -1983,11 +1983,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startgetObject( - com.amazon.s3.client.AmazonS3Stub.GetObject getObject14, + com.amazon.s3.client.AmazonS3Stub.GetObject getObject14, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[7].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/GetObjectRequest"); @@ -2118,9 +2118,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.DeleteBucketResponse deleteBucket( - com.amazon.s3.client.AmazonS3Stub.DeleteBucket deleteBucket16) + com.amazon.s3.client.AmazonS3Stub.DeleteBucket deleteBucket16) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -2218,11 +2218,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startdeleteBucket( - com.amazon.s3.client.AmazonS3Stub.DeleteBucket deleteBucket16, + com.amazon.s3.client.AmazonS3Stub.DeleteBucket deleteBucket16, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[8].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/DeleteBucketRequest"); @@ -2353,9 +2353,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatusResponse setBucketLoggingStatus( - com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatus setBucketLoggingStatus18) + com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatus setBucketLoggingStatus18) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -2453,11 +2453,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startsetBucketLoggingStatus( - com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatus setBucketLoggingStatus18, + com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatus setBucketLoggingStatus18, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[9].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/SetBucketLoggingStatusRequest"); @@ -2589,9 +2589,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicyResponse getObjectAccessControlPolicy( - com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicy getObjectAccessControlPolicy20) + com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicy getObjectAccessControlPolicy20) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -2690,11 +2690,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startgetObjectAccessControlPolicy( - com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicy getObjectAccessControlPolicy20, + com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicy getObjectAccessControlPolicy20, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[10].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/GetObjectAccessControlPolicyRequest"); @@ -2826,9 +2826,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.DeleteObjectResponse deleteObject( - com.amazon.s3.client.AmazonS3Stub.DeleteObject deleteObject22) + com.amazon.s3.client.AmazonS3Stub.DeleteObject deleteObject22) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -2926,11 +2926,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startdeleteObject( - com.amazon.s3.client.AmazonS3Stub.DeleteObject deleteObject22, + com.amazon.s3.client.AmazonS3Stub.DeleteObject deleteObject22, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[11].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/DeleteObjectRequest"); @@ -3061,9 +3061,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicyResponse setBucketAccessControlPolicy( - com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicy setBucketAccessControlPolicy24) + com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicy setBucketAccessControlPolicy24) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -3162,11 +3162,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startsetBucketAccessControlPolicy( - com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicy setBucketAccessControlPolicy24, + com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicy setBucketAccessControlPolicy24, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[12].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/SetBucketAccessControlPolicyRequest"); @@ -3298,9 +3298,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicyResponse setObjectAccessControlPolicy( - com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicy setObjectAccessControlPolicy26) + com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicy setObjectAccessControlPolicy26) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -3399,11 +3399,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startsetObjectAccessControlPolicy( - com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicy setObjectAccessControlPolicy26, + com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicy setObjectAccessControlPolicy26, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[13].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/SetObjectAccessControlPolicyRequest"); @@ -3535,9 +3535,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse putObjectInline( - com.amazon.s3.client.AmazonS3Stub.PutObjectInline putObjectInline28) + com.amazon.s3.client.AmazonS3Stub.PutObjectInline putObjectInline28) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -3635,11 +3635,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startputObjectInline( - com.amazon.s3.client.AmazonS3Stub.PutObjectInline putObjectInline28, + com.amazon.s3.client.AmazonS3Stub.PutObjectInline putObjectInline28, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[14].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/PutObjectInlineRequest"); @@ -3770,9 +3770,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.GetObjectExtendedResponse getObjectExtended( - com.amazon.s3.client.AmazonS3Stub.GetObjectExtended getObjectExtended30) + com.amazon.s3.client.AmazonS3Stub.GetObjectExtended getObjectExtended30) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -3870,11 +3870,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startgetObjectExtended( - com.amazon.s3.client.AmazonS3Stub.GetObjectExtended getObjectExtended30, + com.amazon.s3.client.AmazonS3Stub.GetObjectExtended getObjectExtended30, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[15].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/GetObjectExtendedRequest"); @@ -18445,7 +18445,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public static Permission fromValue(java.lang.String value) throws java.lang.IllegalArgumentException { Permission enumeration = (Permission) - _table_.get(value); + _table_.get(value); if (enumeration == null) throw new java.lang.IllegalArgumentException(); @@ -23125,7 +23125,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public static MetadataDirective fromValue(java.lang.String value) throws java.lang.IllegalArgumentException { MetadataDirective enumeration = (MetadataDirective) - _table_.get(value); + _table_.get(value); if (enumeration == null) throw new java.lang.IllegalArgumentException(); @@ -29108,7 +29108,7 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public static StorageClass fromValue(java.lang.String value) throws java.lang.IllegalArgumentException { StorageClass enumeration = (StorageClass) - _table_.get(value); + _table_.get(value); if (enumeration == null) throw new java.lang.IllegalArgumentException(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java index fd2919d..9ac5c4e 100644 --- a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java +++ b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java @@ -582,12 +582,12 @@ public class EC2RestServlet extends HttpServlet { credentialDao.setCertificateId( accessKey[0], null ); */txn = TransactionLegacy.open(TransactionLegacy.AWSAPI_DB); - UserCredentialsVO user = ucDao.getByAccessKey(accessKey[0]); - user.setCertUniqueId(null); - ucDao.update(user.getId(), user); - response.setStatus(200); - endResponse(response, "User certificate deleted successfully"); - txn.commit(); + UserCredentialsVO user = ucDao.getByAccessKey(accessKey[0]); + user.setCertUniqueId(null); + ucDao.update(user.getId(), user); + response.setStatus(200); + endResponse(response, "User certificate deleted successfully"); + txn.commit(); } else response.setStatus(404); @@ -834,7 +834,7 @@ public class EC2RestServlet extends HttpServlet { // -> execute the request RevokeSecurityGroupIngressResponse EC2response = - EC2SoapServiceImpl.toRevokeSecurityGroupIngressResponse(ServiceProvider.getInstance().getEC2Engine().revokeSecurityGroup(EC2request)); + EC2SoapServiceImpl.toRevokeSecurityGroupIngressResponse(ServiceProvider.getInstance().getEC2Engine().revokeSecurityGroup(EC2request)); serializeResponse(response, EC2response); } @@ -919,7 +919,7 @@ public class EC2RestServlet extends HttpServlet { // -> execute the request AuthorizeSecurityGroupIngressResponse EC2response = - EC2SoapServiceImpl.toAuthorizeSecurityGroupIngressResponse(ServiceProvider.getInstance().getEC2Engine().authorizeSecurityGroup(EC2request)); + EC2SoapServiceImpl.toAuthorizeSecurityGroupIngressResponse(ServiceProvider.getInstance().getEC2Engine().authorizeSecurityGroup(EC2request)); serializeResponse(response, EC2response); } @@ -1016,7 +1016,7 @@ public class EC2RestServlet extends HttpServlet { // -> execute the request CreateSecurityGroupResponse EC2response = - EC2SoapServiceImpl.toCreateSecurityGroupResponse(ServiceProvider.getInstance().getEC2Engine().createSecurityGroup(groupName, groupDescription)); + EC2SoapServiceImpl.toCreateSecurityGroupResponse(ServiceProvider.getInstance().getEC2Engine().createSecurityGroup(groupName, groupDescription)); serializeResponse(response, EC2response); } @@ -1032,7 +1032,7 @@ public class EC2RestServlet extends HttpServlet { // -> execute the request DeleteSecurityGroupResponse EC2response = - EC2SoapServiceImpl.toDeleteSecurityGroupResponse(ServiceProvider.getInstance().getEC2Engine().deleteSecurityGroup(groupName)); + EC2SoapServiceImpl.toDeleteSecurityGroupResponse(ServiceProvider.getInstance().getEC2Engine().deleteSecurityGroup(groupName)); serializeResponse(response, EC2response); } @@ -1170,7 +1170,7 @@ public class EC2RestServlet extends HttpServlet { // -> execute the request ModifyImageAttributeResponse EC2response = - EC2SoapServiceImpl.toModifyImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyImageAttribute(ec2request)); + EC2SoapServiceImpl.toModifyImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyImageAttribute(ec2request)); serializeResponse(response, EC2response); } @@ -1235,7 +1235,7 @@ public class EC2RestServlet extends HttpServlet { // -> execute the request ResetImageAttributeResponse EC2response = - EC2SoapServiceImpl.toResetImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyImageAttribute(ec2request)); + EC2SoapServiceImpl.toResetImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyImageAttribute(ec2request)); serializeResponse(response, EC2response); } @@ -1447,7 +1447,7 @@ public class EC2RestServlet extends HttpServlet { // -> execute the request DescribeAvailabilityZonesResponse EC2response = - EC2SoapServiceImpl.toDescribeAvailabilityZonesResponse(ServiceProvider.getInstance().getEC2Engine().describeAvailabilityZones(EC2request)); + EC2SoapServiceImpl.toDescribeAvailabilityZonesResponse(ServiceProvider.getInstance().getEC2Engine().describeAvailabilityZones(EC2request)); serializeResponse(response, EC2response); } @@ -1503,7 +1503,7 @@ public class EC2RestServlet extends HttpServlet { } DescribeImageAttributeResponse EC2response = - EC2SoapServiceImpl.toDescribeImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().describeImageAttribute(ec2request)); + EC2SoapServiceImpl.toDescribeImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().describeImageAttribute(ec2request)); serializeResponse(response, EC2response); } @@ -1681,7 +1681,7 @@ public class EC2RestServlet extends HttpServlet { // -> execute the request DescribeInstanceAttributeResponse EC2response = - EC2SoapServiceImpl.toDescribeInstanceAttributeResponse(ServiceProvider.getInstance().getEC2Engine().describeInstances(EC2request)); + EC2SoapServiceImpl.toDescribeInstanceAttributeResponse(ServiceProvider.getInstance().getEC2Engine().describeInstances(EC2request)); serializeResponse(response, EC2response); } @@ -1711,7 +1711,7 @@ public class EC2RestServlet extends HttpServlet { // -> execute the request ModifyInstanceAttributeResponse EC2response = - EC2SoapServiceImpl.toModifyInstanceAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyInstanceAttribute(ec2Request)); + EC2SoapServiceImpl.toModifyInstanceAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyInstanceAttribute(ec2Request)); serializeResponse(response, EC2response); } @@ -1770,7 +1770,7 @@ public class EC2RestServlet extends HttpServlet { // -> execute the request EC2Engine engine = ServiceProvider.getInstance().getEC2Engine(); DescribeVolumesResponse EC2response = - EC2SoapServiceImpl.toDescribeVolumesResponse(ServiceProvider.getInstance().getEC2Engine().describeVolumes(EC2request), engine); + EC2SoapServiceImpl.toDescribeVolumesResponse(ServiceProvider.getInstance().getEC2Engine().describeVolumes(EC2request), engine); serializeResponse(response, EC2response); } @@ -1992,7 +1992,7 @@ public class EC2RestServlet extends HttpServlet { * parameter to see if the signature has expired and if so the request fails. */ private boolean authenticateRequest(HttpServletRequest request, HttpServletResponse response) throws SignatureException, IOException, InstantiationException, - IllegalAccessException, ClassNotFoundException, SQLException, ParseException { + IllegalAccessException, ClassNotFoundException, SQLException, ParseException { String cloudSecretKey = null; String cloudAccessKey = null; String signature = null; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java b/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java index e00408e..4b8c758 100644 --- a/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java +++ b/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java @@ -121,7 +121,7 @@ public class ServiceProvider extends ManagerBase { long mhostId = 0; if (mhost != null) mhostId = mhost.getId() != null ? mhost.getId().longValue() : 0L; - return mhostId; + return mhostId; } /** http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java index ccac674..60f974a 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java @@ -126,7 +126,7 @@ public class EC2Engine extends ManagerBase { FileInputStream ec2PropFile = null; try { EC2Prop.load(new FileInputStream(propertiesFile)); - ec2PropFile = new FileInputStream( propertiesFile ); + ec2PropFile = new FileInputStream(propertiesFile); EC2Prop.load(ec2PropFile); } catch (FileNotFoundException e) { @@ -371,12 +371,12 @@ public class EC2Engine extends ManagerBase { CloudStackSecurityGroup resp = null; if (ipPerm.getProtocol().equalsIgnoreCase("icmp")) { resp = - getApi().authorizeSecurityGroupIngress(null, constructList(ipPerm.getIpRangeSet()), null, null, ipPerm.getIcmpCode(), ipPerm.getIcmpType(), - ipPerm.getProtocol(), null, request.getName(), null, secGroupList); + getApi().authorizeSecurityGroupIngress(null, constructList(ipPerm.getIpRangeSet()), null, null, ipPerm.getIcmpCode(), ipPerm.getIcmpType(), + ipPerm.getProtocol(), null, request.getName(), null, secGroupList); } else { resp = - getApi().authorizeSecurityGroupIngress(null, constructList(ipPerm.getIpRangeSet()), null, ipPerm.getToPort().longValue(), null, null, - ipPerm.getProtocol(), null, request.getName(), ipPerm.getFromPort().longValue(), secGroupList); + getApi().authorizeSecurityGroupIngress(null, constructList(ipPerm.getIpRangeSet()), null, ipPerm.getToPort().longValue(), null, null, + ipPerm.getProtocol(), null, request.getName(), ipPerm.getFromPort().longValue(), secGroupList); } if (resp != null) { List ingressRules = resp.getIngressRules(); @@ -815,7 +815,7 @@ public class EC2Engine extends ManagerBase { CloudStackIpAddress cloudIp = cloudIps.get(0); List vmList = - getApi().listVirtualMachines(null, null, true, null, null, null, null, request.getInstanceId(), null, null, null, null, null, null, null, null, null); + getApi().listVirtualMachines(null, null, true, null, null, null, null, request.getInstanceId(), null, null, null, null, null, null, null, null, null); if (vmList == null || vmList.size() == 0) { throw new Exception("Instance not found"); } @@ -972,8 +972,8 @@ public class EC2Engine extends ManagerBase { String osTypeId = imageSet[0].getOsTypeId(); CloudStackTemplate resp = - getApi().createTemplate((request.getDescription() == null ? "" : request.getDescription()), request.getName(), osTypeId, null, null, null, null, null, - null, volumeId); + getApi().createTemplate((request.getDescription() == null ? "" : request.getDescription()), request.getName(), osTypeId, null, null, null, null, null, + null, volumeId); if (resp == null || resp.getId() == null) { throw new Exception("Image couldn't be created"); } @@ -1003,9 +1003,9 @@ public class EC2Engine extends ManagerBase { EC2CreateImageResponse image = new EC2CreateImageResponse(); try { List templates = - getApi().registerTemplate((request.getDescription() == null ? request.getName() : request.getDescription()), request.getFormat(), - request.getHypervisor(), request.getName(), toOSTypeId(request.getOsTypeName()), request.getLocation(), toZoneId(request.getZoneName(), null), null, - null, null, null, null, null, null, null, null); + getApi().registerTemplate((request.getDescription() == null ? request.getName() : request.getDescription()), request.getFormat(), + request.getHypervisor(), request.getName(), toOSTypeId(request.getOsTypeName()), request.getLocation(), toZoneId(request.getZoneName(), null), null, + null, null, null, null, null, null, null, null); if (templates != null) { // technically we will only ever register a single template... for (CloudStackTemplate template : templates) { @@ -1226,7 +1226,7 @@ public class EC2Engine extends ManagerBase { // -> no volume name is given in the Amazon request but is required in the cloud API CloudStackVolume vol = - getApi().createVolume(UUID.randomUUID().toString(), null, diskOfferingId, null, size, snapshotId, toZoneId(request.getZoneName(), null)); + getApi().createVolume(UUID.randomUUID().toString(), null, diskOfferingId, null, size, snapshotId, toZoneId(request.getZoneName(), null)); if (vol != null) { resp.setAttached(vol.getAttached()); resp.setCreated(vol.getCreated()); @@ -1449,8 +1449,8 @@ public class EC2Engine extends ManagerBase { for (int i = 0; i < createInstances; i++) { try { CloudStackUserVm resp = - getApi().deployVirtualMachine(svcOffering.getId(), request.getTemplateId(), zoneId, null, null, null, null, null, null, null, - request.getKeyName(), null, null, groupIds, groupNames, request.getSize().longValue(), request.getUserData()); + getApi().deployVirtualMachine(svcOffering.getId(), request.getTemplateId(), zoneId, null, null, null, null, null, null, null, + request.getKeyName(), null, null, groupIds, groupNames, request.getSize().longValue(), request.getUserData()); EC2Instance vm = new EC2Instance(); vm.setId(resp.getId().toString()); vm.setName(resp.getName()); @@ -1673,7 +1673,7 @@ public class EC2Engine extends ManagerBase { * @param ifs - filter out unwanted instances */ private EC2DescribeInstancesResponse listVirtualMachines(String[] virtualMachineIds, EC2InstanceFilterSet ifs, List resourceTags) - throws Exception { + throws Exception { EC2DescribeInstancesResponse instances = new EC2DescribeInstancesResponse(); if (null == virtualMachineIds || 0 == virtualMachineIds.length) { @@ -1697,7 +1697,7 @@ public class EC2Engine extends ManagerBase { * @param instanceId - if interested in volumes for a specific instance, null if instance is not important */ private EC2DescribeVolumesResponse listVolumes(String volumeId, String instanceId, EC2DescribeVolumesResponse volumes, List resourceTagSet) - throws Exception { + throws Exception { List vols = getApi().listVolumes(null, null, null, volumeId, null, null, null, null, null, instanceId, null, resourceTagSet); if (vols != null && vols.size() > 0) { @@ -1888,11 +1888,11 @@ public class EC2Engine extends ManagerBase { * EC2Instance objects loaded. */ private EC2DescribeInstancesResponse lookupInstances(String instanceId, EC2DescribeInstancesResponse instances, List resourceTagSet) - throws Exception { + throws Exception { String instId = instanceId != null ? instanceId : null; List vms = - getApi().listVirtualMachines(null, null, true, null, null, null, null, instId, null, null, null, null, null, null, null, null, resourceTagSet); + getApi().listVirtualMachines(null, null, true, null, null, null, null, instId, null, null, null, null, null, null, null, null, resourceTagSet); if (vms != null && vms.size() > 0) { for (CloudStackUserVm cloudVm : vms) { @@ -2308,7 +2308,7 @@ public class EC2Engine extends ManagerBase { */ private CloudStackNetwork createDefaultGuestNetwork(String zoneId, CloudStackNetworkOffering offering, CloudStackAccount owner) throws Exception { return getApi().createNetwork(owner.getName() + "-network", owner.getName() + "-network", offering.getId(), zoneId, owner.getName(), owner.getDomainId(), true, - null, null, null, null, null, null, null, null); + null, null, null, null, null, null, null, null); } /** @@ -2695,8 +2695,8 @@ public class EC2Engine extends ManagerBase { if (errorMessage.contains("Object vm_instance(uuid:") && errorMessage.contains(") does not exist")) { throw new EC2ServiceException(ClientError.InvalidInstanceID_NotFound, "Specified Instance ID does not exist"); } else if (errorMessage.contains("Unable to find security group by name") || errorMessage.contains("Unable to find security group") || - (errorMessage.contains("Object security_group(uuid:") && errorMessage.contains(") does not exist")) || - errorMessage.contains("Unable to find group by name ")) { + (errorMessage.contains("Object security_group(uuid:") && errorMessage.contains(") does not exist")) || + errorMessage.contains("Unable to find group by name ")) { throw new EC2ServiceException(ClientError.InvalidGroup_NotFound, "Specified Security Group does not exist"); } else if (errorMessage.contains("Invalid port numbers")) { throw new EC2ServiceException(ClientError.InvalidPermission_Malformed, "Specified Port value is invalid"); @@ -2715,7 +2715,7 @@ public class EC2Engine extends ManagerBase { } else if (errorMessage.contains("Object snapshots(uuid:") && errorMessage.contains(") does not exist")) { throw new EC2ServiceException(ClientError.InvalidSnapshot_NotFound, "Specified Snapshot ID doesn't exist"); } else if ((errorMessage.contains("A key pair with name '") && errorMessage.contains("' does not exist")) || - (errorMessage.contains("A key pair with name '") && errorMessage.contains("' was not found"))) { + (errorMessage.contains("A key pair with name '") && errorMessage.contains("' was not found"))) { throw new EC2ServiceException(ClientError.InvalidKeyPair_NotFound, "Specified Key pair name is invalid"); } else if (errorMessage.contains("A key pair with name '") && errorMessage.contains("' already exists")) { throw new EC2ServiceException(ClientError.InvalidKeyPair_Duplicate, "Specified Key pair already exists"); @@ -2742,7 +2742,7 @@ public class EC2Engine extends ManagerBase { } else if (errorMessage.contains("Unable to find tags by parameters specified")) { throw new EC2ServiceException(ClientError.InvalidParameterValue, "Specified resourceTag for the specified resourceId doesn't exist"); } else if (errorMessage.contains("Failed to enable static nat for the ip address with specified ipId " - + "as vm with specified vmId is already associated with specified currentIp")) { + + "as vm with specified vmId is already associated with specified currentIp")) { throw new EC2ServiceException(ClientError.InvalidParameterValue, "Specified publicIp is already associated to the specified VM"); } else if (errorMessage.contains("Specified IP address id is not associated with any vm Id")) { throw new EC2ServiceException(ClientError.InvalidParameterValue, "Specified publicIp is not associated to any VM"); @@ -2790,7 +2790,7 @@ public class EC2Engine extends ManagerBase { throw new EC2ServiceException(ClientError.InvalidAMIID_NotFound, "Specified ImageId is unavailable"); } else if (errorMessage.contains("cannot stop VM") && errorMessage.contains("when it is in state Starting")) { throw new EC2ServiceException(ClientError.IncorrectInstanceState, - "Unable to stop. One or more of the specified instances is in an incorrect state 'pending'"); + "Unable to stop. One or more of the specified instances is in an incorrect state 'pending'"); } else if (errorMessage.contains("Failed to authorize security group ingress rule(s)")) { throw new EC2ServiceException(ClientError.InvalidParameterValue, "Specified Ip-permission is invalid" + " or the Ip-permission already exists"); } else if (errorMessage.contains("Failed to reboot vm instance")) { @@ -2805,7 +2805,7 @@ public class EC2Engine extends ManagerBase { throw new EC2ServiceException(ClientError.VolumeLimitExceeded, "You have reached the limit on the number of volumes that can be created"); } else if (errorMessage.contains("Maximum number of resources of type 'public_ip' for account") && errorMessage.contains("has been exceeded")) { throw new EC2ServiceException(ClientError.AddressLimitExceeded, - "You have reached the limit on the number of elastic ip addresses your account can have"); + "You have reached the limit on the number of elastic ip addresses your account can have"); } else if (errorMessage.contains("Unable to apply save userdata entry on router")) { throw new EC2ServiceException(ClientError.InvalidParameterValue, "The value supplied for parameter UserData is invalid"); } else { @@ -2853,7 +2853,7 @@ public class EC2Engine extends ManagerBase { throw new EC2ServiceException(ServerError.InternalError, "Unable to start the instance that was stopped during image creation"); } else if (errorMessage.contains("One or more of instanceIds specified is in stopped state")) { throw new EC2ServiceException(ClientError.IncorrectInstanceState, - "Unable to reboot. One or more of the specified instances is in an incorrect state 'stopped'"); + "Unable to reboot. One or more of the specified instances is in an incorrect state 'stopped'"); } else if (errorMessage.contains("Specified ipAddress doesn't exist")) { throw new EC2ServiceException(ClientError.InvalidParameterValue, "Specified publicIp doesn't exist"); } else if (errorMessage.contains("Min Count is greater than the number of instances left to allocate")) { @@ -2872,7 +2872,7 @@ public class EC2Engine extends ManagerBase { throw new EC2ServiceException(ClientError.InvalidInstanceID_NotFound, "One or more of the specified instanceId not found"); } else if (errorMessage.contains("Cannot modify, instance should be in stopped state")) { throw new EC2ServiceException(ClientError.IncorrectInstanceState, - "Unable to modify instance attribute. Specified instance is not in the correct state 'stopped'"); + "Unable to modify instance attribute. Specified instance is not in the correct state 'stopped'"); } else { throw new EC2ServiceException(ServerError.InternalError, "An unexpected error occured"); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/build/checkstyle/src/main/resources/tooling/checkstyle.xml ---------------------------------------------------------------------- diff --git a/build/checkstyle/src/main/resources/tooling/checkstyle.xml b/build/checkstyle/src/main/resources/tooling/checkstyle.xml index 9b65029..47ea1fb 100644 --- a/build/checkstyle/src/main/resources/tooling/checkstyle.xml +++ b/build/checkstyle/src/main/resources/tooling/checkstyle.xml @@ -1,56 +1,55 @@ - + - - - - - - - - + + + - - - - - - - - - - - - - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/agent/api/AttachVolumeCommand.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/api/AttachVolumeCommand.java b/core/src/com/cloud/agent/api/AttachVolumeCommand.java index 911ff54..a0ee419 100644 --- a/core/src/com/cloud/agent/api/AttachVolumeCommand.java +++ b/core/src/com/cloud/agent/api/AttachVolumeCommand.java @@ -84,7 +84,7 @@ public class AttachVolumeCommand extends Command { } public String getVolumeName() { - return volumeName; + return volumeName; } public Long getVolumeSize() { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/agent/api/ComputeChecksumCommand.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/api/ComputeChecksumCommand.java b/core/src/com/cloud/agent/api/ComputeChecksumCommand.java index aec244b..8c654d7 100755 --- a/core/src/com/cloud/agent/api/ComputeChecksumCommand.java +++ b/core/src/com/cloud/agent/api/ComputeChecksumCommand.java @@ -16,10 +16,10 @@ // under the License. package com.cloud.agent.api; -import com.cloud.agent.api.storage.ssCommand; +import com.cloud.agent.api.storage.SsCommand; import com.cloud.agent.api.to.DataStoreTO; -public class ComputeChecksumCommand extends ssCommand { +public class ComputeChecksumCommand extends SsCommand { private DataStoreTO store; private String templatePath; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java index 84f50af..7880554 100644 --- a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java +++ b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java @@ -79,8 +79,8 @@ public class CreatePrivateTemplateFromVolumeCommand extends SnapshotCommand { } @Override - public void setVolumePath(String _volumePath) { - this._volumePath = _volumePath; + public void setVolumePath(String volumePath) { + this._volumePath = volumePath; } @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/agent/api/ManageSnapshotCommand.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/api/ManageSnapshotCommand.java b/core/src/com/cloud/agent/api/ManageSnapshotCommand.java index e3abb50..fb2d0d5 100644 --- a/core/src/com/cloud/agent/api/ManageSnapshotCommand.java +++ b/core/src/com/cloud/agent/api/ManageSnapshotCommand.java @@ -22,8 +22,8 @@ import com.cloud.storage.StoragePool; public class ManageSnapshotCommand extends Command { // XXX: Should be an enum // XXX: Anyway there is something called inheritance in Java - public static String CREATE_SNAPSHOT = "-c"; - public static String DESTROY_SNAPSHOT = "-d"; + public static final String CREATE_SNAPSHOT = "-c"; + public static final String DESTROY_SNAPSHOT = "-d"; private String _commandSwitch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/agent/api/PerformanceMonitorAnswer.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/api/PerformanceMonitorAnswer.java b/core/src/com/cloud/agent/api/PerformanceMonitorAnswer.java index 10f4185..f8ec05d 100644 --- a/core/src/com/cloud/agent/api/PerformanceMonitorAnswer.java +++ b/core/src/com/cloud/agent/api/PerformanceMonitorAnswer.java @@ -17,11 +17,11 @@ package com.cloud.agent.api; public class PerformanceMonitorAnswer extends Answer { - public PerformanceMonitorAnswer() { - } + public PerformanceMonitorAnswer() { + } - public PerformanceMonitorAnswer(PerformanceMonitorCommand cmd, - boolean result, String details) { - super(cmd, result, details); - } + public PerformanceMonitorAnswer(PerformanceMonitorCommand cmd, + boolean result, String details) { + super(cmd, result, details); + } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/agent/api/PerformanceMonitorCommand.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/api/PerformanceMonitorCommand.java b/core/src/com/cloud/agent/api/PerformanceMonitorCommand.java index 882d7b1..d0a6eb1 100644 --- a/core/src/com/cloud/agent/api/PerformanceMonitorCommand.java +++ b/core/src/com/cloud/agent/api/PerformanceMonitorCommand.java @@ -21,26 +21,26 @@ import java.util.Map; public class PerformanceMonitorCommand extends Command { - Map params = new HashMap(); + Map params = new HashMap(); - public PerformanceMonitorCommand() { - } + public PerformanceMonitorCommand() { + } - public PerformanceMonitorCommand(Map params, int wait) { - setWait(wait); - this.params = params; - } + public PerformanceMonitorCommand(Map params, int wait) { + setWait(wait); + this.params = params; + } - @Override - public boolean executeInSequence() { - return false; - } + @Override + public boolean executeInSequence() { + return false; + } - public Map getParams() { - return params; - } + public Map getParams() { + return params; + } - public void setParams(Map params) { - this.params = params; - } + public void setParams(Map params) { + this.params = params; + } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/agent/api/StartAnswer.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/api/StartAnswer.java b/core/src/com/cloud/agent/api/StartAnswer.java index 92dce84..3bd7bff 100644 --- a/core/src/com/cloud/agent/api/StartAnswer.java +++ b/core/src/com/cloud/agent/api/StartAnswer.java @@ -22,7 +22,7 @@ import com.cloud.agent.api.to.VirtualMachineTO; public class StartAnswer extends Answer { VirtualMachineTO vm; - String host_guid; + String hostGuid; Map _iqnToPath; protected StartAnswer() { @@ -41,13 +41,13 @@ public class StartAnswer extends Answer { public StartAnswer(StartCommand cmd) { super(cmd, true, null); this.vm = cmd.getVirtualMachine(); - this.host_guid = null; + this.hostGuid = null; } public StartAnswer(StartCommand cmd, String msg, String guid) { super(cmd, true, msg); this.vm = cmd.getVirtualMachine(); - this.host_guid = guid; + this.hostGuid = guid; } public VirtualMachineTO getVirtualMachine() { @@ -55,7 +55,7 @@ public class StartAnswer extends Answer { } public String getHost_guid() { - return host_guid; + return hostGuid; } public void setIqnToPath(Map iqnToPath) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/agent/api/StopAnswer.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/api/StopAnswer.java b/core/src/com/cloud/agent/api/StopAnswer.java index b593174..ff2cd19 100755 --- a/core/src/com/cloud/agent/api/StopAnswer.java +++ b/core/src/com/cloud/agent/api/StopAnswer.java @@ -24,12 +24,12 @@ public class StopAnswer extends RebootAnswer { } public StopAnswer(StopCommand cmd, String details, String platform, boolean success) { - super(cmd, details, success); + super(cmd, details, success); this.platform = platform; } public StopAnswer(StopCommand cmd, String details, boolean success) { - super(cmd, details, success); + super(cmd, details, success); this.platform = null; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/agent/api/UpdateHostPasswordCommand.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/api/UpdateHostPasswordCommand.java b/core/src/com/cloud/agent/api/UpdateHostPasswordCommand.java index 6e448ee..15fb714 100644 --- a/core/src/com/cloud/agent/api/UpdateHostPasswordCommand.java +++ b/core/src/com/cloud/agent/api/UpdateHostPasswordCommand.java @@ -20,24 +20,24 @@ import com.cloud.agent.api.LogLevel.Log4jLevel; public class UpdateHostPasswordCommand extends Command { @LogLevel(Log4jLevel.Off) - protected String _username; + protected String username; @LogLevel(Log4jLevel.Off) - protected String _new_password; + protected String newPassword; protected UpdateHostPasswordCommand() { } - public UpdateHostPasswordCommand(String username, String new_password) { - this._username = username; - this._new_password = new_password; + public UpdateHostPasswordCommand(String username, String newPassword) { + this.username = username; + this.newPassword = newPassword; } public String getNewPassword() { - return _new_password; + return newPassword; } public String getUsername() { - return _username; + return username; } @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/agent/api/baremetal/PrepareCreateTemplateCommand.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/api/baremetal/PrepareCreateTemplateCommand.java b/core/src/com/cloud/agent/api/baremetal/PrepareCreateTemplateCommand.java new file mode 100644 index 0000000..f88526a --- /dev/null +++ b/core/src/com/cloud/agent/api/baremetal/PrepareCreateTemplateCommand.java @@ -0,0 +1,66 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.agent.api.baremetal; + +import com.cloud.agent.api.Command; + +public class PrepareCreateTemplateCommand extends Command { + String ip; + String mac; + String netMask; + String gateway; + String dns; + String template; + + @Override + public boolean executeInSequence() { + return true; + } + + public PrepareCreateTemplateCommand(String ip, String mac, String netMask, String gateway, String dns, String template) { + this.ip = ip; + this.mac = mac; + this.netMask = netMask; + this.gateway = gateway; + this.dns = dns; + this.template = template; + } + + public String getIp() { + return ip; + } + + public String getMac() { + return mac; + } + + public String getNetMask() { + return netMask; + } + + public String getGateWay() { + return gateway; + } + + public String getDns() { + return dns; + } + + public String getTemplate() { + return template; + } +} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java b/core/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java deleted file mode 100644 index b187420..0000000 --- a/core/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java +++ /dev/null @@ -1,66 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package com.cloud.agent.api.baremetal; - -import com.cloud.agent.api.Command; - -public class prepareCreateTemplateCommand extends Command { - String ip; - String mac; - String netMask; - String gateway; - String dns; - String template; - - @Override - public boolean executeInSequence() { - return true; - } - - public prepareCreateTemplateCommand(String ip, String mac, String netMask, String gateway, String dns, String template) { - this.ip = ip; - this.mac = mac; - this.netMask = netMask; - this.gateway = gateway; - this.dns = dns; - this.template = template; - } - - public String getIp() { - return ip; - } - - public String getMac() { - return mac; - } - - public String getNetMask() { - return netMask; - } - - public String getGateWay() { - return gateway; - } - - public String getDns() { - return dns; - } - - public String getTemplate() { - return template; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/agent/api/routing/IpAliasTO.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/api/routing/IpAliasTO.java b/core/src/com/cloud/agent/api/routing/IpAliasTO.java index fac3ed5..3876e14 100644 --- a/core/src/com/cloud/agent/api/routing/IpAliasTO.java +++ b/core/src/com/cloud/agent/api/routing/IpAliasTO.java @@ -19,12 +19,12 @@ package com.cloud.agent.api.routing; public class IpAliasTO { String routerip; String netmask; - String alias_count; + String aliasCount; - public IpAliasTO(String routerip, String netmask, String alias_count) { + public IpAliasTO(String routerip, String netmask, String aliasCount) { this.routerip = routerip; this.netmask = netmask; - this.alias_count = alias_count; + this.aliasCount = aliasCount; } public String getRouterip() { @@ -36,6 +36,6 @@ public class IpAliasTO { } public String getAlias_count() { - return alias_count; + return aliasCount; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java b/core/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java index 5c54375..06ef62b 100644 --- a/core/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java +++ b/core/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java @@ -46,12 +46,12 @@ public class LoadBalancerConfigCommand extends NetworkElementCommand { this.vpcId = vpcId; } - public LoadBalancerConfigCommand(LoadBalancerTO[] loadBalancers, String PublicIp, String GuestIp, String PrivateIp, NicTO nic, Long vpcId, String maxconn, + public LoadBalancerConfigCommand(LoadBalancerTO[] loadBalancers, String publicIp, String guestIp, String privateIp, NicTO nic, Long vpcId, String maxconn, boolean keepAliveEnabled) { this.loadBalancers = loadBalancers; - this.lbStatsPublicIP = PublicIp; - this.lbStatsPrivateIP = PrivateIp; - this.lbStatsGuestIP = GuestIp; + this.lbStatsPublicIP = publicIp; + this.lbStatsPrivateIP = privateIp; + this.lbStatsGuestIP = guestIp; this.nic = nic; this.vpcId = vpcId; this.maxconn = maxconn; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java b/core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java index 0977175..097af66 100644 --- a/core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java +++ b/core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java @@ -18,7 +18,7 @@ package com.cloud.agent.api.storage; import com.cloud.storage.Storage.ImageFormat; -public abstract class AbstractDownloadCommand extends ssCommand { +public abstract class AbstractDownloadCommand extends SsCommand { private String url; private ImageFormat format; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java index 56d9c30..250405e 100644 --- a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java +++ b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java @@ -61,8 +61,8 @@ public class CreatePrivateTemplateAnswer extends Answer { _virtualSize = virtualSize; } - public void setphysicalSize(long _physicalSize) { - this._physicalSize = _physicalSize; + public void setphysicalSize(long physicalSize) { + this._physicalSize = physicalSize; } public long getphysicalSize() { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/agent/api/storage/SsCommand.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/api/storage/SsCommand.java b/core/src/com/cloud/agent/api/storage/SsCommand.java new file mode 100644 index 0000000..d4a6e5b --- /dev/null +++ b/core/src/com/cloud/agent/api/storage/SsCommand.java @@ -0,0 +1,48 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.agent.api.storage; + +import com.cloud.agent.api.Command; + +public abstract class SsCommand extends Command { + private String secUrl; + + public SsCommand() { + } + + protected SsCommand(SsCommand that) { + this.secUrl = that.secUrl; + } + + public SsCommand(String secUrl) { + this.secUrl = secUrl; + } + + @Override + public boolean executeInSequence() { + return true; + } + + public String getSecUrl() { + return secUrl; + } + + public void setSecUrl(String secUrl) { + this.secUrl = secUrl; + } + +} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/agent/api/storage/ssCommand.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/api/storage/ssCommand.java b/core/src/com/cloud/agent/api/storage/ssCommand.java deleted file mode 100644 index 939e394..0000000 --- a/core/src/com/cloud/agent/api/storage/ssCommand.java +++ /dev/null @@ -1,48 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package com.cloud.agent.api.storage; - -import com.cloud.agent.api.Command; - -public abstract class ssCommand extends Command { - private String secUrl; - - public ssCommand() { - } - - protected ssCommand(ssCommand that) { - this.secUrl = that.secUrl; - } - - public ssCommand(String secUrl) { - this.secUrl = secUrl; - } - - @Override - public boolean executeInSequence() { - return true; - } - - public String getSecUrl() { - return secUrl; - } - - public void setSecUrl(String secUrl) { - this.secUrl = secUrl; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/info/RunningHostInfoAgregator.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/info/RunningHostInfoAgregator.java b/core/src/com/cloud/info/RunningHostInfoAgregator.java index 689cdeb..cec8037 100644 --- a/core/src/com/cloud/info/RunningHostInfoAgregator.java +++ b/core/src/com/cloud/info/RunningHostInfoAgregator.java @@ -24,9 +24,9 @@ import com.cloud.host.Host; public class RunningHostInfoAgregator { public static class ZoneHostInfo { - public static int ROUTING_HOST_MASK = 2; - public static int STORAGE_HOST_MASK = 4; - public static int ALL_HOST_MASK = ROUTING_HOST_MASK | STORAGE_HOST_MASK; + public static final int ROUTING_HOST_MASK = 2; + public static final int STORAGE_HOST_MASK = 4; + public static final int ALL_HOST_MASK = ROUTING_HOST_MASK | STORAGE_HOST_MASK; private long dcId; @@ -51,7 +51,7 @@ public class RunningHostInfoAgregator { } } - private Map zoneHostInfoMap = new HashMap(); + private final Map zoneHostInfoMap = new HashMap(); public RunningHostInfoAgregator() { } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/network/LoadBalancerValidator.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/network/LoadBalancerValidator.java b/core/src/com/cloud/network/LoadBalancerValidator.java index 3fb8a2f..f318899 100644 --- a/core/src/com/cloud/network/LoadBalancerValidator.java +++ b/core/src/com/cloud/network/LoadBalancerValidator.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.network; -import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.lb.LoadBalancingRule; public interface LoadBalancerValidator { @@ -24,7 +23,6 @@ public interface LoadBalancerValidator { * Validate rules * @param rule * @return true/false. If there are no validation then true should be return. - * @throws ResourceUnavailableException */ public boolean validateLBRule(LoadBalancingRule rule); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/core/src/com/cloud/network/resource/TrafficSentinelResource.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/network/resource/TrafficSentinelResource.java b/core/src/com/cloud/network/resource/TrafficSentinelResource.java index ada5f5e..67c0dd4 100644 --- a/core/src/com/cloud/network/resource/TrafficSentinelResource.java +++ b/core/src/com/cloud/network/resource/TrafficSentinelResource.java @@ -243,11 +243,11 @@ public class TrafficSentinelResource implements ServerResource { return answer; } - private String getScript(List Ips, Date start, Date end) { + private String getScript(List ips, Date start, Date end) { String IpAddresses = ""; - for (int i = 0; i < Ips.size(); i++) { - IpAddresses += Ips.get(i); - if (i != (Ips.size() - 1)) { + for (int i = 0; i < ips.size(); i++) { + IpAddresses += ips.get(i); + if (i != (ips.size() - 1)) { // Append comma for all Ips except the last Ip IpAddresses += ","; }